David S. Miller 6b0a7f84ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflict resolution of af_smc.c from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-04-17 11:26:25 -07:00
..
addr.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
addr.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
atm_misc.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
atm_sysfs.c	net: Use octal not symbolic permissions	2018-03-26 12:07:48 -04:00
br2684.c	atm: Preserve value of skb->truesize when accounting to vcc	2018-06-17 08:27:01 +09:00
clip.c	ipv4: Prepare rtable for IPv6 gateway	2019-04-08 15:22:40 -07:00
common.c	Revert "net: simplify sock_poll_wait"	2018-10-23 10:57:06 -07:00
common.h	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
ioctl.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Kconfig	[ATM]: atm is no longer experimental	2008-01-28 15:00:11 -08:00
lec_arpc.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
lec.c	net: atm: Fix potential Spectre v1 vulnerabilities	2019-04-16 21:01:45 -07:00
lec.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mpc.c	atm: Preserve value of skb->truesize when accounting to vcc	2018-06-17 08:27:01 +09:00
mpc.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mpoa_caches.c	atm: mpoa: remove 32-bit timekeeping	2017-11-30 09:26:32 -05:00
mpoa_caches.h	atm: mpoa: remove 32-bit timekeeping	2017-11-30 09:26:32 -05:00
mpoa_proc.c	atm: remove blank lines at EOF	2018-07-24 14:10:42 -07:00
pppoatm.c	atomics/treewide: Remove atomic_inc_not_zero_hint()	2018-06-21 14:22:33 +02:00
proc.c	atm: clean up vcc_seq_next()	2019-02-16 18:12:22 -08:00
protocols.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
pvc.c	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
raw.c	atm: Preserve value of skb->truesize when accounting to vcc	2018-06-17 08:27:01 +09:00
resources.c	net: atm: Add another IS_ENABLED(CONFIG_COMPAT) in atm_dev_ioctl	2019-03-07 10:14:50 -08:00
resources.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
signaling.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
signaling.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
svc.c	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00