David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Lots of easy overlapping changes in the confict
resolutions here.

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

2018-05-26 19:46:15 -04:00

..

array.c

proc: Use underscores for SSBD in 'status'

2018-05-09 21:41:38 +02:00

base.c

proc: do not access cmdline nor environ from file-backed areas

2018-05-17 09:27:47 -07:00

cmdline.c

proc: faster /proc/cmdline

2018-04-11 10:28:34 -07:00

consoles.c

fs/proc/consoles.c: use seq_putc() in show_console_dev()

2018-02-06 18:32:44 -08:00

cpuinfo.c

x86 / CPU: Always show current CPU frequency in /proc/cpuinfo

2017-11-15 19:46:50 +01:00

devices.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

fd.c

proc: use %u for pid printing and slightly less stack

2018-02-06 18:32:43 -08:00

fd.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

generic.c

proc: revalidate misc dentries

2018-04-13 17:10:27 -07:00

inode.c

proc: move "struct proc_dir_entry" into kmem cache

2018-04-11 10:28:34 -07:00

internal.h

proc: use slower rb_first()

2018-04-11 10:28:34 -07:00

interrupts.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

Kconfig

vmcore: add API to collect hardware dump in second kernel

2018-05-14 13:46:04 -04:00

kcore.c

proc/kcore: don't bounds check against address 0

2018-05-11 17:28:45 -07:00

kmsg.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

loadavg.c

proc: fix /proc/loadavg regression

2018-04-20 17:18:36 -07:00

Makefile

proc: : uninline name_to_int()

2017-11-17 16:10:00 -08:00

meminfo.c

proc: add seq_put_decimal_ull_width to speed up /proc/pid/smaps

2018-04-11 10:28:33 -07:00

namespaces.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

nommu.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

page.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

proc_net.c

proc: use slower rb_first()

2018-04-11 10:28:34 -07:00

proc_sysctl.c

fs/proc/proc_sysctl.c: fix typo in sysctl_check_table_array()

2018-04-11 10:28:38 -07:00

proc_tty.c

Merge tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2017-11-13 21:05:31 -08:00

root.c

proc: use slower rb_first()

2018-04-11 10:28:34 -07:00

self.c

fs/proc: use __ro_after_init

2018-02-06 18:32:43 -08:00

softirqs.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

stat.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

task_mmu.c

mm, pagemap: fix swap offset value for PMD migration entry

2018-04-20 17:18:35 -07:00

task_nommu.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

thread_self.c

fs/proc: use __ro_after_init

2018-02-06 18:32:43 -08:00

uptime.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

util.c

proc: use do-while in name_to_int()

2017-11-17 16:10:00 -08:00

version.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

vmcore.c

vmcore: move get_vmcore_size out of __init

2018-05-21 12:34:22 -04:00