David S. Miller 7cda4cee13 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Small overlapping change conflict ('net' changed a line,
'net-next' added a line right afterwards) in flexcan.c

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-12-05 10:44:19 -05:00

..

bpf

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-12-05 10:44:19 -05:00

cgroup

Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

2017-11-15 14:29:44 -08:00

configs

…

debug

…

events

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

2017-11-26 13:41:48 -08:00

gcov

…

irq

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

2017-11-26 14:39:20 -08:00

livepatch

Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching

2017-11-15 10:21:58 -08:00

locking

kmemcheck: remove annotations

2017-11-15 18:21:04 -08:00

power

mm: remove __GFP_COLD

2017-11-15 18:21:06 -08:00

printk

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk

2017-11-21 05:28:13 -10:00

rcu

…

sched

Merge branch 'misc.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-11-17 11:54:55 -08:00

time

Merge tag 'for-linus-timers-conversion-final-v4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/urgent

2017-11-23 16:29:05 +01:00

trace

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-12-04 11:14:46 -08:00

.gitignore

…

acct.c

…

async.c

…

audit_fsnotify.c

…

audit_tree.c

…

audit_watch.c

…

audit.c

…

audit.h

Merge tag 'audit-pr-20171113' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit

2017-11-15 13:28:48 -08:00

auditfilter.c

…

auditsc.c

Merge tag 'audit-pr-20171113' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit

2017-11-15 13:28:48 -08:00

backtracetest.c

…

bounds.c

…

capability.c

…

compat.c

…

configs.c

…

context_tracking.c

…

cpu_pm.c

…

cpu.c

…

crash_core.c

kdump: print a message in case parse_crashkernel_mem resulted in zero bytes

2017-11-17 16:10:03 -08:00

crash_dump.c

…

cred.c

…

delayacct.c

…

dma.c

…

elfcore.c

…

exec_domain.c

…

exit.c

…

extable.c

…

fork.c

pid: remove pidhash

2017-11-17 16:10:04 -08:00

freezer.c

…

futex_compat.c

…

futex.c

…

groups.c

…

hung_task.c

…

irq_work.c

…

jump_label.c

…

kallsyms.c

kallsyms: take advantage of the new '%px' format

2017-11-29 10:30:13 -08:00

kcmp.c

…

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.locks

…

Kconfig.preempt

…

kcov.c

kcov: support comparison operands collection

2017-11-17 16:10:04 -08:00

kexec_core.c

…

kexec_file.c

…

kexec_internal.h

…

kexec.c

…

kmod.c

…

kprobes.c

…

ksysfs.c

…

kthread.c

treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts

2017-11-21 16:35:54 -08:00

latencytop.c

…

Makefile

…

memremap.c

…

module_signing.c

…

module-internal.h

…

module.c

kallsyms: take advantage of the new '%px' format

2017-11-29 10:30:13 -08:00

notifier.c

…

nsproxy.c

…

padata.c

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

panic.c

kernel/panic.c: add TAINT_AUX

2017-11-17 16:10:04 -08:00

params.c

…

pid_namespace.c

pid: remove pidhash

2017-11-17 16:10:04 -08:00

pid.c

pid: remove pidhash

2017-11-17 16:10:04 -08:00

profile.c

…

ptrace.c

…

range.c

…

reboot.c

kernel/reboot.c: add devm_register_reboot_notifier()

2017-11-17 16:10:04 -08:00

relay.c

…

resource.c

…

seccomp.c

…

signal.c

Merge branch 'akpm' (patches from Andrew)

2017-11-17 16:56:17 -08:00

smp.c

…

smpboot.c

…

smpboot.h

…

softirq.c

kmemcheck: rip it out

2017-11-15 18:21:05 -08:00

stacktrace.c

…

stop_machine.c

…

sys_ni.c

…

sys.c

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2017-11-15 10:56:56 -08:00

sysctl_binary.c

…

sysctl.c

kernel/sysctl.c: code cleanups

2017-11-17 16:10:03 -08:00

task_work.c

…

taskstats.c

…

test_kprobes.c

…

torture.c

…

tracepoint.c

…

tsacct.c

…

ucount.c

…

uid16.c

…

umh.c

kernel/umh.c: optimize 'proc_cap_handler()'

2017-11-17 16:10:01 -08:00

up.c

…

user_namespace.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2017-11-16 12:20:15 -08:00

user-return-notifier.c

…

user.c

…

utsname_sysctl.c

…

utsname.c

…

watchdog_hld.c

…

watchdog.c

…

workqueue_internal.h

…

workqueue.c

treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts

2017-11-21 16:35:54 -08:00