David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

Signed-off-by: David S. Miller <davem@davemloft.net>

2016-08-18 01:17:32 -04:00

..

array.c

procfs: expose umask in /proc/<PID>/status

2016-05-20 17:58:30 -07:00

base.c

proc_oom_score: remove tasklist_lock and pid_alive()

2016-08-02 17:31:41 -04:00

cmdline.c

fs/proc: don't use module_init for non-modular core code

2014-01-23 16:37:02 -08:00

consoles.c

fs/proc: don't use module_init for non-modular core code

2014-01-23 16:37:02 -08:00

cpuinfo.c

fs/proc: don't use module_init for non-modular core code

2014-01-23 16:37:02 -08:00

devices.c

fs/proc: don't use module_init for non-modular core code

2014-01-23 16:37:02 -08:00

fd.c

switch all procfs directories ->iterate_shared()

2016-05-02 19:49:30 -04:00

fd.h

proc: Move proc_fd() to fs/proc/fd.h

2013-05-01 17:29:39 -04:00

generic.c

proc: make proc entries inherit ownership from parent

2016-08-14 21:07:20 -07:00

inode.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2016-07-29 15:54:19 -07:00

internal.h

proc: Convert proc_mount to use mount_ns.

2016-06-23 15:41:54 -05:00

interrupts.c

fs/proc: don't use module_init for non-modular core code

2014-01-23 16:37:02 -08:00

Kconfig

fs, proc: add help for CONFIG_PROC_CHILDREN

2015-07-17 16:39:52 -07:00

kcore.c

wrappers for ->i_mutex access

2016-01-22 18:04:28 -05:00

kmsg.c

fs/proc: don't use module_init for non-modular core code

2014-01-23 16:37:02 -08:00

loadavg.c

fs/proc: don't use module_init for non-modular core code

2014-01-23 16:37:02 -08:00

Makefile

fs/proc: Add compiler check for -Wno-override-init to support gcc < 4.2

2016-08-03 12:45:23 -04:00

meminfo.c

proc, meminfo: use correct helpers for calculating LRU sizes in meminfo

2016-08-11 16:58:13 -07:00

namespaces.c

switch all procfs directories ->iterate_shared()

2016-05-02 19:49:30 -04:00

nommu.c

vfs: add seq_file_path() helper

2015-06-23 18:01:07 -04:00

page.c

mm: rename _count, field of the struct page, to _refcount

2016-05-19 19:12:14 -07:00

proc_net.c

proc: make proc entries inherit ownership from parent

2016-08-14 21:07:20 -07:00

proc_sysctl.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-08-18 01:17:32 -04:00

proc_tty.c

proc: remove proc_tty_ldisc variable

2014-08-08 15:57:22 -07:00

root.c

proc: Convert proc_mount to use mount_ns.

2016-06-23 15:41:54 -05:00

self.c

wrappers for ->i_mutex access

2016-01-22 18:04:28 -05:00

softirqs.c

fs/proc: don't use module_init for non-modular core code

2014-01-23 16:37:02 -08:00

stat.c

procfs: avoid 32-bit time_t in /proc/*/stat

2016-08-02 17:31:41 -04:00

task_mmu.c

mm, rmap: account shmem thp pages

2016-07-26 16:19:19 -07:00

task_nommu.c

proc: revert /proc/<pid>/maps [stack:TID] annotation

2016-02-03 08:28:43 -08:00

thread_self.c

wrappers for ->i_mutex access

2016-01-22 18:04:28 -05:00

uptime.c

cputime: Default implementation of nsecs -> cputime conversion

2014-03-13 15:56:43 +01:00

version.c

fs/proc: don't use module_init for non-modular core code

2014-01-23 16:37:02 -08:00

vmcore.c

crash_dump: Add vmcore_elf32_check_arch

2016-05-13 14:01:59 +02:00