David S. Miller ac80010fc9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Mere overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-12-22 15:15:05 -08:00
..
altera-stapl	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 61	2019-05-24 17:36:45 +02:00
c2port	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
cardreader	misc: rtsx: Add support for RTS5261	2019-11-14 13:07:48 +08:00
cb710	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
cxl	compat_ioctl: use correct compat_ptr() translation in drivers	2019-10-23 17:23:44 +02:00
echo	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 176	2019-05-30 11:29:19 -07:00
eeprom	Merge branch 'i2c/for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2019-12-01 18:29:36 -08:00
genwqe	compat_ioctl: use correct compat_ptr() translation in drivers	2019-10-23 17:23:44 +02:00
habanalabs	habanalabs: remove variable 'val' set but not used	2019-12-14 15:12:21 +02:00
ibmasm	Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2019-07-19 10:42:02 -07:00
lis3lv02d	lis3lv02d: switch to using input device polling mode	2019-10-10 15:24:19 +02:00
lkdtm	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2019-12-01 19:05:07 -08:00
mei	compat_ioctl: remove most of fs/compat_ioctl.c	2019-12-01 13:46:15 -08:00
mic	misc: MIC: drop all 'comment' lines from its Kconfig	2019-10-10 15:24:20 +02:00
ocxl	ocxl: Fix potential memory leak on context creation	2019-12-14 07:59:39 +11:00
sgi-gru	sgi-gru: simplify procfs code some more	2019-10-10 15:24:19 +02:00
sgi-xp	netdev: pass the stuck queue to the timeout handler	2019-12-12 21:38:57 -08:00
ti-st	drivers/misc: ti-st: Remove unneeded variable in st_tty_open	2019-10-04 15:14:37 +02:00
vmw_vmci	compat_ioctl: remove most of fs/compat_ioctl.c	2019-12-01 13:46:15 -08:00
ad525x_dpot-i2c.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 149	2019-05-30 11:25:18 -07:00
ad525x_dpot-spi.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 149	2019-05-30 11:25:18 -07:00
ad525x_dpot.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 149	2019-05-30 11:25:18 -07:00
ad525x_dpot.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 149	2019-05-30 11:25:18 -07:00
apds990x.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 336	2019-06-05 17:37:07 +02:00
apds9802als.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 167	2019-05-30 11:26:39 -07:00
atmel_tclib.c	misc: atmel_tclib: use devm_platform_ioremap_resource() to simplify code	2019-10-10 15:24:19 +02:00
atmel-ssc.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
bh1770glc.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 336	2019-06-05 17:37:07 +02:00
cs5535-mfgpt.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00
ds1682.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
dummy-irq.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
enclosure.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 176	2019-05-30 11:29:19 -07:00
fastrpc.c	Merge 5.4-rc3 into char-misc-next	2019-10-14 07:36:49 +02:00
hmc6352.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 167	2019-05-30 11:26:39 -07:00
hpilo.c
hpilo.h	misc: Use the correct style for SPDX License Identifier	2019-10-10 15:34:40 +02:00
ibmvmc.c
ibmvmc.h	misc: Use the correct style for SPDX License Identifier	2019-10-10 15:34:40 +02:00
ics932s401.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156	2019-05-30 11:26:35 -07:00
isl29003.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 61	2019-05-24 17:36:45 +02:00
isl29020.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 167	2019-05-30 11:26:39 -07:00
Kconfig	misc: Fix Kconfig indentation	2019-11-20 15:09:49 +01:00
kgdbts.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 333	2019-06-05 17:37:06 +02:00
lattice-ecp3-config.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
Makefile	Char/Misc driver patches for 5.4-rc1	2019-09-18 11:14:31 -07:00
pch_phub.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 167	2019-05-30 11:26:39 -07:00
pci_endpoint_test.c	PCI: Add PCI_STD_NUM_BARS for the number of standard BARs	2019-10-14 10:22:26 -05:00
phantom.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
pti.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174	2019-05-30 11:26:41 -07:00
pvpanic.c
qcom-coincell.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 284	2019-06-05 17:36:37 +02:00
sram-exec.c	lib/genalloc.c: rename addr_in_gen_pool to gen_pool_has_addr	2019-12-04 19:44:13 -08:00
sram.c	misc: sram: use devm_platform_ioremap_resource_wc()	2019-11-05 18:32:47 +01:00
sram.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
tifm_7xx1.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
tifm_core.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
tsl2550.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 61	2019-05-24 17:36:45 +02:00
vexpress-syscfg.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174	2019-05-30 11:26:41 -07:00
vmw_balloon.c	vmw_balloon: Fix offline page marking with compaction	2019-08-28 22:57:07 +02:00
xilinx_sdfec.c	misc: xilinx_sdfec: fix spelling mistake: "Schdule" -> "Schedule"	2019-08-22 14:28:10 -07:00