David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ...

The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

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

2018-08-02 10:55:32 -07:00

..

compat.c

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

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

ipc_sysctl.c

ipc/msg: increase MSGMNI, remove scaling

2014-12-13 12:42:52 -08:00

Makefile

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

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

mq_sysctl.c

ipc: convert use of typedef ctl_table to struct ctl_table

2014-06-06 16:08:16 -07:00

mqueue.c

y2038: ipc: Enable COMPAT_32BIT_TIME

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

msg.c

rhashtable: split rhashtable.h

2018-06-22 13:43:27 +09:00

msgutil.c

ipc: convert ipc_namespace.count from atomic_t to refcount_t

2017-09-08 18:26:51 -07:00

namespace.c

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

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

sem.c

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

2018-08-02 10:55:32 -07:00

shm.c

rhashtable: split rhashtable.h

2018-06-22 13:43:27 +09:00

syscall.c

y2038: ipc: Redirect ipc(SEMTIMEDOP, ...) to compat_ksys_semtimedop

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

util.c

rhashtable: split rhashtable.h

2018-06-22 13:43:27 +09:00

util.h

y2038: ipc: Enable COMPAT_32BIT_TIME

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