David S. Miller 6f6e434aa2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... S390 bpf_jit.S is removed in net-next and had changes in 'net', since that code isn't used any more take the removal. TLS data structures split the TX and RX components in 'net-next', put the new struct members from the bug fix in 'net' into the RX part. The 'net-next' tree had some reworking of how the ERSPAN code works in the GRE tunneling code, overlapping with a one-line headroom calculation fix in 'net'. Overlapping changes in __sock_map_ctx_update_elem(), keep the bits that read the prog members via READ_ONCE() into local variables before using them. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-21 16:01:54 -04:00
..
bpf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04:00
cgroup	Merge branch 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2018-04-03 18:00:13 -07:00
configs	KVM changes for 4.16	2018-02-10 13:16:35 -08:00
debug	* Fix 2032 time access issues and new compiler warnings	2018-04-12 10:21:19 -07:00
events	perf/core: Fix possible Spectre-v1 indexing for ->aux_pages[]	2018-05-05 08:37:27 +02:00
gcov
irq	genirq/affinity: Spread irq vectors among present CPUs as far as possible	2018-04-06 12:19:51 +02:00
livepatch	livepatch: Allow to call a custom callback when freeing shadow variables	2018-04-17 13:42:48 +02:00
locking	locking/percpu-rwsem: Annotate rwsem ownership transfer by setting RWSEM_OWNER_UNKNOWN	2018-05-16 11:45:16 +02:00
power	PM / QoS: mark expected switch fall-throughs	2018-04-09 13:49:40 +02:00
printk	New features:	2018-04-10 11:27:30 -07:00
rcu	Merge branches 'fixes.2018.02.23a', 'srcu.2018.02.20a' and 'torture.2018.02.20a' into HEAD	2018-02-23 15:15:41 -08:00
sched	sched/deadline: Make the grub_reclaim() function static	2018-05-18 09:05:22 +02:00
time	tick/broadcast: Use for_each_cpu() specially on UP kernels	2018-05-15 22:45:54 +02:00
trace	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-11 20:53:22 -04:00
.gitignore
acct.c
async.c	kernel/async.c: revert "async: simplify lowest_in_progress()"	2018-02-06 18:32:44 -08:00
audit_fsnotify.c
audit_tree.c	audit: track the owner of the command mutex ourselves	2018-02-23 11:22:22 -05:00
audit_watch.c
audit.c	audit/stable-4.17 PR 20180403	2018-04-06 15:01:25 -07:00
audit.h	audit: track the owner of the command mutex ourselves	2018-02-23 11:22:22 -05:00
auditfilter.c	audit: deprecate the AUDIT_FILTER_ENTRY filter	2018-02-15 14:36:29 -05:00
auditsc.c	audit: bail before bug check if audit disabled	2018-02-15 14:40:25 -05:00
backtracetest.c
bounds.c
capability.c
compat.c	compat: fix 4-byte infoleak via uninitialized struct field	2018-05-10 17:51:58 -07:00
configs.c
context_tracking.c
cpu_pm.c
cpu.c	cpu/hotplug: Fix unused function warning	2018-03-15 20:34:40 +01:00
crash_core.c	kexec: export PG_swapbacked to VMCOREINFO	2018-04-13 17:10:27 -07:00
crash_dump.c
cred.c
delayacct.c
dma.c
elfcore.c
exec_domain.c	get rid of pointless includes of fs_struct.h	2018-02-22 14:28:50 -05:00
exit.c	kernel: use kernel_wait4() instead of sys_wait4()	2018-04-02 20:14:51 +02:00
extable.c	extable: Make init_kernel_text() global	2018-02-21 16:54:06 +01:00
fail_function.c	error-injection: Fix to prohibit jump optimization	2018-03-12 16:16:00 +01:00
fork.c	fork: unconditionally clear stack on fork	2018-04-20 17:18:35 -07:00
freezer.c
futex_compat.c
futex.c	pids: introduce find_get_task_by_vpid() helper	2018-02-06 18:32:46 -08:00
groups.c
hung_task.c
irq_work.c
jump_label.c	jump_label: Disable jump labels in __exit code	2018-03-20 08:57:17 +01:00
kallsyms.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk	2018-02-01 13:36:15 -08:00
kcmp.c
Kconfig.freezer
Kconfig.hz
Kconfig.locks
Kconfig.preempt
kcov.c	kcov: detect double association with a single task	2018-02-06 18:32:46 -08:00
kexec_core.c
kexec_file.c	kernel/kexec_file.c: allow archs to set purgatory load address	2018-04-13 17:10:28 -07:00
kexec_internal.h
kexec.c	kexec: call do_kexec_load() in compat syscall directly	2018-04-02 20:15:01 +02:00
kmod.c
kprobes.c	kprobes: Fix random address output of blacklist file	2018-04-25 10:27:56 -04:00
ksysfs.c
kthread.c	kthread, sched/wait: Fix kthread_parkme() completion issue	2018-05-03 07:38:05 +02:00
latencytop.c
Makefile
memremap.c	kernel/memremap: Remove stale devres_free() call	2018-03-06 10:58:54 -08:00
module_signing.c
module-internal.h
module.c	init: fix false positives in W+X checking	2018-05-11 17:28:45 -07:00
notifier.c
nsproxy.c
padata.c
panic.c	taint: add taint for randstruct	2018-04-11 10:28:35 -07:00
params.c	kernel/params.c: downgrade warning for unsafe parameters	2018-04-11 10:28:37 -07:00
pid_namespace.c	Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2018-04-03 19:15:32 -07:00
pid.c	xarray: add the xa_lock to the radix_tree_root	2018-04-11 10:28:39 -07:00
profile.c
ptrace.c	pids: introduce find_get_task_by_vpid() helper	2018-02-06 18:32:46 -08:00
range.c
reboot.c
relay.c	kernel/relay.c: limit kmalloc size to KMALLOC_MAX_SIZE	2018-02-21 15:35:43 -08:00
resource.c	resource: fix integer overflow at reallocation	2018-04-13 17:10:27 -07:00
seccomp.c	- Fix seccomp GET_METADATA to deal with field sizes correctly (Tycho Andersen)	2018-02-22 10:50:24 -08:00
signal.c	sched/core: Introduce set_special_state()	2018-05-04 07:54:54 +02:00
smp.c
smpboot.c
smpboot.h
softirq.c	softirq: Consolidate common code in tasklet_[hi]_action()	2018-03-09 11:50:55 +01:00
stacktrace.c
stop_machine.c	stop_machine, sched: Fix migrate_swap() vs. active_balance() deadlock	2018-05-03 07:38:03 +02:00
sys_ni.c	syscalls/core: Prepare CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y for compat syscalls	2018-04-05 16:59:38 +02:00
sys.c	kernel: add ksys_setsid() helper; remove in-kernel call to sys_setsid()	2018-04-02 20:16:06 +02:00
sysctl_binary.c	staging: irda: remove remaining remants of irda code removal	2018-04-16 11:26:49 +02:00
sysctl.c	kernel/sysctl.c: add kdoc comments to do_proc_do{u}intvec_minmax_conv_param	2018-04-11 10:28:38 -07:00
task_work.c
taskstats.c	pids: introduce find_get_task_by_vpid() helper	2018-02-06 18:32:46 -08:00
test_kprobes.c
torture.c
tracepoint.c	tracepoint: Do not warn on ENOMEM	2018-04-30 12:09:56 -04:00
tsacct.c
ucount.c	headers: untangle kmemleak.h from mm.h	2018-04-05 21:36:27 -07:00
uid16.c	fs: add do_fchownat(), ksys_fchown() helpers and ksys_{,l}chown() wrappers	2018-04-02 20:15:59 +02:00
uid16.h	kernel: provide ksys_*() wrappers for syscalls called by kernel/uid16.c	2018-04-02 20:15:30 +02:00
umh.c	kernel: use kernel_wait4() instead of sys_wait4()	2018-04-02 20:14:51 +02:00
up.c
user_namespace.c
user-return-notifier.c
user.c	efivarfs: Limit the rate for non-root to read files	2018-02-22 10:21:02 -08:00
utsname_sysctl.c
utsname.c	uts: create "struct uts_namespace" from kmem_cache	2018-04-11 10:28:35 -07:00
watchdog_hld.c
watchdog.c
workqueue_internal.h
workqueue.c	Merge branch 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2018-04-03 18:00:13 -07:00