David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
bpf	bpf: permits narrower load from bpf program context fields	2017-06-14 14:56:25 -04:00
cgroup	cpuset: consider dying css as offline	2017-05-24 12:43:30 -04:00
configs
debug
events	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
gcov
irq	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-05-21 11:45:26 -07:00
livepatch	livepatch: Make livepatch dependent on !TRIM_UNUSED_KSYMS	2017-05-27 00:27:37 +02:00
locking	futex,rt_mutex: Fix rt_mutex_cleanup_proxy_lock()	2017-05-22 21:57:18 +02:00
power	Merge branches 'intel_pstate' and 'pm-sleep'	2017-06-09 01:25:16 +02:00
printk	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk	2017-06-08 10:50:04 -07:00
rcu	srcu: Allow use of Classic SRCU from both process and interrupt context	2017-06-08 08:25:19 -07:00
sched	Merge branches 'pm-cpufreq', 'pm-cpuidle' and 'pm-devfreq'	2017-06-15 01:51:33 +02:00
time	posix-timers: Make signal printks conditional	2017-05-23 23:39:57 +02:00
trace	bpf: permits narrower load from bpf program context fields	2017-06-14 14:56:25 -04:00
.gitignore
acct.c
async.c
audit.c
audit.h
audit_fsnotify.c
audit_tree.c	Merge branch 'fsnotify' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs	2017-05-03 11:05:15 -07:00
audit_watch.c
auditfilter.c
auditsc.c
backtracetest.c
bounds.c
capability.c
compat.c
configs.c
context_tracking.c
cpu.c	cpu/hotplug: Drop the device lock on error	2017-06-03 09:35:04 +02:00
cpu_pm.c
crash_core.c	ia64: reuse append_elf_note() and final_note() functions	2017-05-08 17:15:11 -07:00
crash_dump.c
cred.c
delayacct.c
dma.c
elfcore.c
exec_domain.c
exit.c
extable.c
fork.c	Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-05-27 08:52:27 -07:00
freezer.c
futex.c	futex: Clarify mark_wake_futex memory barrier usage	2017-04-15 16:03:46 +02:00
futex_compat.c
groups.c
hung_task.c	kernel/hung_task.c: defer showing held locks	2017-05-08 17:15:10 -07:00
irq_work.c
jump_label.c	This release has no new tracing features, just clean ups, minor fixes	2017-02-27 13:26:17 -08:00
kallsyms.c
kcmp.c
Kconfig.freezer
Kconfig.hz
Kconfig.locks	locking/mutex: Allow MUTEX_SPIN_ON_OWNER when DEBUG_MUTEXES	2016-10-25 11:31:51 +02:00
Kconfig.preempt
kcov.c
kexec.c
kexec_core.c
kexec_file.c
kexec_internal.h
kmod.c
kprobes.c	kprobes/x86: Fix to set RWX bits correctly before releasing trampoline	2017-05-26 22:37:00 -04:00
ksysfs.c
kthread.c
latencytop.c
Makefile
membarrier.c
memremap.c
module-internal.h
module.c
module_signing.c
notifier.c
nsproxy.c
padata.c
panic.c
params.c
pid.c
pid_namespace.c
profile.c	sched/headers: Prepare to move sched_info_on() and force_schedstat_enabled() from <linux/sched.h> to <linux/sched/stat.h>	2017-03-02 08:42:39 +01:00
ptrace.c	ptrace: Properly initialize ptracer_cred on fork	2017-05-23 07:40:44 -05:00
range.c
reboot.c
relay.c
resource.c
seccomp.c
signal.c
smp.c
smpboot.c
smpboot.h
softirq.c
stacktrace.c
stop_machine.c
sys.c
sys_ni.c
sysctl.c
sysctl_binary.c
task_work.c
taskstats.c	taskstats: add e/u/stime for TGID command	2017-05-08 17:15:12 -07:00
test_kprobes.c
torture.c
tracepoint.c
tsacct.c	sched/headers: Prepare to move cputime functionality from <linux/sched.h> into <linux/sched/cputime.h>	2017-03-02 08:42:39 +01:00
ucount.c
uid16.c	sched/headers: Prepare to remove <linux/cred.h> inclusion from <linux/sched.h>	2017-03-02 08:42:31 +01:00
up.c
user-return-notifier.c
user.c
user_namespace.c
utsname.c
utsname_sysctl.c
watchdog.c
watchdog_hld.c
workqueue.c
workqueue_internal.h