David S. Miller c1c8626fce Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Lots of overlapping changes, mostly trivial in nature. The mlxsw conflict was resolving using the example resolution at: https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-05 13:04:31 -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
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
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	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-05 13:04:31 -07: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