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

gcov: support GCC 7.1

2017-05-12 15:57:15 -07:00

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_fsnotify.c

…

audit_tree.c

…

audit_watch.c

…

audit.c

…

audit.h

…

auditfilter.c

…

auditsc.c

…

backtracetest.c

…

bounds.c

…

capability.c

…

compat.c

…

configs.c

…

context_tracking.c

…

cpu_pm.c

…

cpu.c

cpu/hotplug: Drop the device lock on error

2017-06-03 09:35:04 +02:00

crash_core.c

…

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_compat.c

…

futex.c

…

groups.c

mm, vmalloc: use __GFP_HIGHMEM implicitly

2017-05-08 17:15:13 -07:00

hung_task.c

…

irq_work.c

…

jump_label.c

…

kallsyms.c

…

kcmp.c

…

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.locks

…

Kconfig.preempt

…

kcov.c

kcov: simplify interrupt check

2017-05-08 17:15:12 -07:00

kexec_core.c

…

kexec_file.c

…

kexec_internal.h

…

kexec.c

…

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_signing.c

…

module-internal.h

…

module.c

kernel/module.c: use set_memory.h header

2017-05-08 17:15:14 -07:00

notifier.c

…

nsproxy.c

…

padata.c

…

panic.c

…

params.c

…

pid_namespace.c

pid_ns: Sleep in TASK_INTERRUPTIBLE in zap_pid_ns_processes

2017-05-13 17:26:01 -05:00

pid.c

…

profile.c

…

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

Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-05-10 10:30:46 -07:00

smp.c

…

smpboot.c

…

smpboot.h

…

softirq.c

…

stacktrace.c

…

stop_machine.c

…

sys_ni.c

…

sys.c

…

sysctl_binary.c

…

sysctl.c

…

task_work.c

…

taskstats.c

…

test_kprobes.c

…

torture.c

…

tracepoint.c

…

tsacct.c

…

ucount.c

…

uid16.c

…

up.c

…

user_namespace.c

…

user-return-notifier.c

…

user.c

…

utsname_sysctl.c

…

utsname.c

…

watchdog_hld.c

…

watchdog.c

…

workqueue_internal.h

…

workqueue.c

…