Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

Conflicts:
	in fs/proc/task_mmu.c:
	looks like vma_get_anon_name() want have a name for anonymous
	vma when there is no name used in vma. commit: 586278d78bf
	The name show is after any other names, so it maybe covered.
	but anyway, it just a show here.

diff --cc Documentation/filesystems/proc.txt
index 1c425191574cb3e04a6406fe765ce3ca89c23fce,6716413c17ba5988e4b8cbccace13784c22e935a..fea4777a569594d9b4ed7af58f82ddfa0b690dfb
--- 1/Documentation/filesystems/proc.txt
--- 2/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@@ -379,11 -378,8 +379,10 @@@ is not associated with a file
  
   [heap]                   = the heap of the program
   [stack]                  = the stack of the main process
-  [stack:1001]             = the stack of the thread with tid 1001
   [vdso]                   = the "virtual dynamic shared object",
                              the kernel system call handler
 + [anon:<name>]            = an anonymous mapping that has been
 +                            named by userspace
  
   or if empty, the mapping is anonymous.
  

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/mm/mmu.c
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc block/genhd.c
Simple merge

diff --cc drivers/char/random.c
Simple merge

diff --cc fs/proc/task_mmu.c
index 3e97da37b67c1d18522de52a616c0c76c1efc25e,d598b9c809c12f71b9d18b8baae631d4117264c2..200e3b29aa22d535a37b17e1d51f194a68e21c1e
--- 1/fs/proc/task_mmu.c
--- 2/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@@ -387,27 -341,8 +391,14 @@@ show_map_vma(struct seq_file *m, struc
                        goto done;
                }
  
-               tid = pid_of_stack(priv, vma, is_pid);
-               if (tid != 0) {
-                       /*
-                        * Thread stack in /proc/PID/task/TID/maps or
-                        * the main process stack.
-                        */
-                       if (!is_pid || (vma->vm_start <= mm->start_stack &&
-                           vma->vm_end >= mm->start_stack)) {
-                               name = "[stack]";
-                       } else {
-                               /* Thread stack in /proc/PID/maps */
-                               seq_pad(m, ' ');
-                               seq_printf(m, "[stack:%d]", tid);
-                       }
 -              if (is_stack(priv, vma, is_pid))
++              if (is_stack(priv, vma, is_pid)) {
+                       name = "[stack]";
 +                      goto done;
 +              }
- 
 +              if (vma_get_anon_name(vma)) {
 +                      seq_pad(m, ' ');
 +                      seq_print_vma_name(m, vma);
 +              }
        }
  
  done:

diff --cc include/linux/blkdev.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/perf_event.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/cputime.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc kernel/time/hrtimer.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge