AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-22 01:16:57 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
b57459e913
linux_dsm_epyc7002/arch/s390
History
David S. Miller 9f0d34bc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/asix_common.c
	drivers/net/usb/sr9800.c
	drivers/net/usb/usbnet.c
	include/linux/usb/usbnet.h
	net/ipv4/tcp_ipv4.c
	net/ipv6/tcp_ipv6.c

The TCP conflicts were overlapping changes.  In 'net' we added a
READ_ONCE() to the socket cached RX route read, whilst in 'net-next'
Eric Dumazet touched the surrounding code dealing with how mini
sockets are handled.

With USB, it's a case of the same bug fix first going into net-next
and then I cherry picked it back into net.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-02 16:16:53 -04:00
..
appldata s390: appldata: drop owner assignment from platform_drivers 2014-10-20 16:20:13 +02:00
boot s390/sclp: fix declaration of _sclp_print_early() 2015-01-08 10:02:51 +01:00
configs s390: update default configuration 2015-01-22 12:16:09 +01:00
crypto s390/crypto: remove 'const' to avoid compiler warnings 2015-01-08 10:02:53 +01:00
hypfs VFS: (Scripted) Convert S_ISLNK/DIR/REG(dentry->d_inode) to d_is_*(dentry) 2015-02-22 11:38:41 -05:00
include Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-04-02 16:16:53 -04:00
kernel Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-04-02 16:16:53 -04:00
kvm kvm: move advertising of KVM_CAP_IRQFD to common code 2015-03-10 21:18:59 -03:00
lib s390/spinlock: add compare-and-delay to lock wait loops 2015-01-23 15:17:04 +01:00
math-emu s390: fix save and restore of the floating-point-control register 2013-10-24 17:17:11 +02:00
mm s390/mm: align 64-bit PIE binaries to 4GB 2015-02-19 10:36:32 +01:00
net s390/bpf: Zero extend parameters before calling C function 2015-01-15 11:10:41 +01:00
oprofile s390: Replace __get_cpu_var uses 2014-08-26 13:45:52 -04:00
pci s390/pci: unify pci_iomap symbol exports 2015-02-27 17:50:07 +01:00
defconfig s390: update default configuration 2015-01-22 12:16:09 +01:00
Kbuild
Kconfig s390/smp: increase maximum value of NR_CPUS to 512 2015-01-30 09:31:13 +01:00
Kconfig.debug
Makefile s390/ftrace: hotpatch support for function tracing 2015-01-29 09:19:25 +01:00