linux/arch/powerpc
David S. Miller 8565d26bcb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The BPF verifier conflict was some minor contextual issue.

The TUN conflict was less trivial.  Cong Wang fixed a memory leak of
tfile->tx_array in 'net'.  This is an skb_array.  But meanwhile in
net-next tun changed tfile->tx_arry into tfile->tx_ring which is a
ptr_ring.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-01-19 22:59:33 -05:00
..
boot powerpc: dts: P1010: Add endianness property to flexcan node 2017-12-01 09:14:23 +01:00
configs powerpc/configs: Enable I2C_CHARDEV for pseries and powernv 2017-10-22 12:08:31 +02:00
crypto License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
include powerpc fixes for 4.15 #8 2018-01-19 11:19:11 -08:00
kernel powerpc/64s: Allow control of RFI flush via debugfs 2018-01-17 23:30:21 +11:00
kvm powerpc fixes for 4.15 #7 2018-01-14 15:03:17 -08:00
lib powerpc/64s: Add support for RFI flush of L1-D cache 2018-01-10 21:27:06 +11: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 powerpc/mm: Fix SEGV on mapped region to return SEGV_ACCERR 2018-01-02 21:12:33 +11:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-12-22 11:16:31 -05:00
oprofile treewide: setup_timer() -> timer_setup() 2017-11-21 15:57:07 -08:00
perf powerpc/perf: Fix kfree memory allocated for nest pmus 2017-12-13 20:51:22 +11:00
platforms powerpc/powernv: Check device-tree for RFI flush settings 2018-01-10 21:27:16 +11:00
purgatory License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
sysdev kernel/irq: Extend lockdep class for request mutex 2017-12-28 12:26:35 +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
xmon powerpc/xmon: Don't print hashed pointers in paca dump 2018-01-11 01:17:24 +11:00
Kconfig powerpc/64s: Wire up cpu_show_meltdown() 2018-01-17 23:30:20 +11:00
Kconfig.debug powerpc updates for 4.15 2017-11-16 12:47:46 -08:00
Makefile Merge branch 'fixes' into next 2017-08-23 22:20:10 +10:00
Makefile.postlink License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00