WSL2-Linux-Kernel/arch/powerpc
David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-20 06:08:27 -07:00
..
boot powerpc: dts: p1022si: Add fsl,wake-on-filer for eTSEC 2015-10-07 04:19:43 -07:00
configs powerpc/configs: Re-enable CONFIG_SCSI_DH 2015-09-29 20:34:03 +10:00
crypto
include powerpc fixes for 4.3 #3 2015-10-16 12:07:43 -07:00
kernel PCI updates for v4.3: 2015-09-25 11:16:53 -07:00
kvm KVM: PPC: Book3S: Take the kvm->srcu lock in kvmppc_h_logical_ci_load/store() 2015-09-21 09:05:15 +10:00
lib powerpc32: memset: only use dcbz once cache is enabled 2015-09-17 10:36:53 +10:00
math-emu
mm powerpc: Fix checkstop in native_hpte_clear() with lockdep 2015-10-09 08:01:38 +11:00
net ebpf: migrate bpf_prog's flags to bitfield 2015-10-03 05:02:39 -07:00
oprofile
perf
platforms powerpc/powernv: Panic on unhandled Machine Check 2015-10-09 08:07:19 +11:00
sysdev Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2015-09-18 08:11:42 -07:00
xmon
Kconfig kexec: split kexec_load syscall from kexec core code 2015-09-10 13:29:01 -07:00
Kconfig.debug
Makefile
relocs_check.sh