David S. Miller 19d28fbd30 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... BPF alignment tests got a conflict because the registers are output as Rn_w instead of just Rn in net-next, and in net a fixup for a testcase prohibits logical operations on pointers before using them. Also, we should attempt to patch BPF call args if JIT always on is enabled. Instead, if we fail to JIT the subprogs we should pass an error back up and fail immediately. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-01-11 22:13:42 -05:00
..
boards	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-11 22:13:42 -05:00
boot	Kbuild updates for v4.15	2017-11-17 17:45:29 -08:00
cchips	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
configs	sh: defconfig: cleanup from old Kconfig options	2017-09-08 18:26:51 -07:00
drivers	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
include	SolutionEngine771x: add Ether TSU resource	2018-01-09 12:21:14 -05:00
kernel	sh_eth: remove sh_eth_plat_data::edmac_endian	2018-01-08 14:10:33 -05:00
lib	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
lib64	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
math-emu	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mm	A couple of dma-mapping updates:	2017-11-14 16:54:12 -08:00
oprofile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
tools	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Kconfig	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Kconfig.cpu	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Kconfig.debug	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile	sh: select KBUILD_DEFCONFIG depending on ARCH	2017-11-13 22:58:18 +09:00