David S. Miller e1ea2f9856 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Several conflicts here. NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to nfp_fl_output() needed some adjustments because the code block is in an else block now. Parallel additions to net/pkt_cls.h and net/sch_generic.h A bug fix in __tcp_retransmit_skb() conflicted with some of the rbtree changes in net-next. The tc action RCU callback fixes in 'net' had some overlap with some of the recent tcf_block reworking. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-10-30 21:09:24 +09:00
..
alpha	pci-v4.14-fixes-6	2017-10-28 10:53:24 -07:00
arc	ARC: unbork module link errors with !CONFIG_ARC_HAS_LLSC	2017-10-11 17:07:44 -07:00
arm	xen: fixes for 4.14-rc7	2017-10-27 20:41:05 -07:00
arm64	Allwinner fixes for 4.14	2017-10-20 22:24:48 +02:00
blackfin	blackfin: ezbrd: Remove non-functional DSA/KSZ8893M code	2017-09-20 15:57:02 -07:00
c6x	arch: remove unused *_segments() macros/functions	2017-09-22 12:59:52 -10:00
cris	MTD changes for 4.14:	2017-09-09 14:48:21 -07:00
frv	arch: remove unused *_segments() macros/functions	2017-09-22 12:59:52 -10:00
h8300	arch: define CPU_BIG_ENDIAN for all fixed big endian archs	2017-09-08 18:26:48 -07:00
hexagon	Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-09-04 11:52:29 -07:00
ia64	Merge branch 'work.ipc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-09-14 17:37:26 -07:00
m32r	m32r: fix build failure	2017-10-03 17:54:26 -07:00
m68k	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu	2017-09-10 21:07:39 -07:00
metag	arch: remove unused *_segments() macros/functions	2017-09-22 12:59:52 -10:00
microblaze	arch: change default endian for microblaze	2017-09-25 15:31:26 +02:00
mips	MIPS: math-emu: Remove pr_err() calls from fpu_emu()	2017-10-09 16:33:34 +02:00
mn10300	arch: remove unused *_segments() macros/functions	2017-09-22 12:59:52 -10:00
nios2	nios2 update for v4.14-rc1	2017-09-15 12:47:21 -07:00
openrisc	OpenRISC patches for 4.14	2017-09-13 11:52:18 -07:00
parisc	parisc: Fix detection of nonsynchronous cr16 cycle counters	2017-10-19 09:21:24 +02:00
powerpc	Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2017-10-19 14:42:09 +02:00
s390	s390/kvm: fix detection of guest machine checks	2017-10-25 07:59:30 +02:00
score
sh	sh: sh7269: remove nonexistent GPIO_PH[0-7] to fix pinctrl registration	2017-10-03 17:54:24 -07:00
sparc	Revert commit 1a8b6d76dc ("net:add one common config...")	2017-10-09 07:43:06 -07:00
tile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2017-09-22 13:02:54 -10:00
um	um: net: Convert timers to use timer_setup()	2017-10-18 12:40:27 +01:00
unicore32	unicore32/PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks	2017-08-03 16:29:34 -05:00
x86	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-10-27 17:19:39 -07:00
xtensa	arch: remove unused *_segments() macros/functions	2017-09-22 12:59:52 -10:00
.gitignore
Kconfig	Revert commit 1a8b6d76dc ("net:add one common config...")	2017-10-09 07:43:06 -07:00