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

..

calibrate.c

…

do_mounts_initrd.c

kernel: add ksys_setsid() helper; remove in-kernel call to sys_setsid()

2018-04-02 20:16:06 +02:00

do_mounts_md.c

fs: add ksys_ioctl() helper; remove in-kernel calls to sys_ioctl()

2018-04-02 20:16:03 +02:00

do_mounts_rd.c

init/ramdisk: use pr_cont() at the end of ramdisk loading

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

do_mounts.c

fs: add ksys_read() helper; remove in-kernel calls to sys_read()

2018-04-02 20:16:04 +02:00

do_mounts.h

fs: add do_mknodat() helper and ksys_mknod() wrapper; remove in-kernel calls to syscall

2018-04-02 20:15:56 +02:00

init_task.c

…

initramfs.c

fs: add ksys_getdents64() helper; remove in-kernel calls to sys_getdents64()

2018-04-02 20:16:02 +02:00

Kconfig

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

2018-05-21 16:01:54 -04:00

main.c

init/main.c: include <linux/mem_encrypt.h>

2018-05-25 18:12:11 -07:00

Makefile

…

noinitramfs.c

fs: add do_mknodat() helper and ksys_mknod() wrapper; remove in-kernel calls to syscall

2018-04-02 20:15:56 +02:00

version.c

…