mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-24 10:28:57 +00:00
9f0d34bc34
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> |
||
---|---|---|
.. | ||
vdso32 | ||
vdso64 | ||
.gitignore | ||
asm-offsets.c | ||
audit.c | ||
audit.h | ||
base.S | ||
cache.c | ||
compat_audit.c | ||
compat_linux.c | ||
compat_linux.h | ||
compat_ptrace.h | ||
compat_signal.c | ||
compat_wrapper.c | ||
cpcmd.c | ||
crash_dump.c | ||
debug.c | ||
diag.c | ||
dis.c | ||
dumpstack.c | ||
early.c | ||
ebcdic.c | ||
entry64.S | ||
entry.h | ||
entry.S | ||
ftrace.c | ||
head31.S | ||
head64.S | ||
head_kdump.S | ||
head.S | ||
idle.c | ||
ipl.c | ||
irq.c | ||
jump_label.c | ||
kprobes.c | ||
lgr.c | ||
machine_kexec.c | ||
Makefile | ||
mcount.S | ||
module.c | ||
nmi.c | ||
os_info.c | ||
perf_cpum_cf_events.c | ||
perf_cpum_cf.c | ||
perf_cpum_sf.c | ||
perf_event.c | ||
pgm_check.S | ||
process.c | ||
processor.c | ||
ptrace.c | ||
reipl64.S | ||
reipl.S | ||
relocate_kernel64.S | ||
relocate_kernel.S | ||
runtime_instr.c | ||
s390_ksyms.c | ||
sclp.S | ||
setup.c | ||
signal.c | ||
smp.c | ||
stacktrace.c | ||
suspend.c | ||
swsusp_asm64.S | ||
sys_s390.c | ||
syscalls.S | ||
sysinfo.c | ||
time.c | ||
topology.c | ||
traps.c | ||
uprobes.c | ||
vdso.c | ||
vmlinux.lds.S | ||
vtime.c |