David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two trivial overlapping changes conflicts in MPLS and mlx5.

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

2017-01-28 10:33:06 -05:00

..

bpf

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

2017-01-28 10:33:06 -05:00

configs

…

debug

…

events

perf/x86/intel: Account interrupts for PEBS errors

2017-01-14 11:06:49 +01:00

gcov

…

irq

…

livepatch

…

locking

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

power

Merge branches 'pm-sleep' and 'pm-cpufreq'

2017-01-27 00:08:59 +01:00

printk

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

rcu

rcu: Narrow early boot window of illegal synchronous grace periods

2017-01-14 21:23:48 -08:00

sched

ktime: Cleanup ktime_set() usage

2016-12-25 17:21:22 +01:00

time

nohz: Fix collision between tick and other hrtimers

2017-01-11 10:41:33 +01:00

trace

trace: add variant without spacing in trace_print_hex_seq

2017-01-25 13:17:47 -05:00

.gitignore

…

acct.c

…

async.c

…

audit_fsnotify.c

…

audit_tree.c

Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit

2017-01-05 23:06:06 -08:00

audit_watch.c

…

audit.c

…

audit.h

…

auditfilter.c

…

auditsc.c

…

backtracetest.c

…

bounds.c

…

capability.c

capability: export has_capability

2017-01-12 07:01:56 -07:00

cgroup_freezer.c

…

cgroup_pids.c

…

cgroup.c

…

compat.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

configs.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

context_tracking.c

…

cpu_pm.c

…

cpu.c

cpu/hotplug: Remove unused but set variable in _cpu_down()

2017-01-18 11:55:09 +01:00

cpuset.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

crash_dump.c

…

cred.c

…

delayacct.c

…

dma.c

…

elfcore.c

…

exec_domain.c

…

exit.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

extable.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

fork.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

freezer.c

…

futex_compat.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

futex.c

ktime: Get rid of the union

2016-12-25 17:21:22 +01:00

groups.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

hung_task.c

…

irq_work.c

…

jump_label.c

jump_labels: API for flushing deferred jump label updates

2017-01-12 14:33:16 +01:00

kallsyms.c

…

kcmp.c

…

Kconfig.freezer

…

Kconfig.hz

…

Kconfig.locks

…

Kconfig.preempt

…

kcov.c

…

kexec_core.c

…

kexec_file.c

…

kexec_internal.h

…

kexec.c

…

kmod.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

kprobes.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

ksysfs.c

…

kthread.c

…

latencytop.c

…

Makefile

…

membarrier.c

…

memremap.c

mm: fix devm_memremap_pages crash, use mem_hotplug_{begin, done}

2017-01-10 18:31:54 -08:00

module_signing.c

…

module-internal.h

…

module.c

taint/module: Fix problems when out-of-kernel driver defines true or false

2017-01-17 10:56:45 -08:00

notifier.c

…

nsproxy.c

…

padata.c

…

panic.c

kernel/panic.c: add missing \n

2017-01-24 16:26:14 -08:00

params.c

…

pid_namespace.c

pid: fix lockdep deadlock warning due to ucount_lock

2017-01-10 13:34:56 +13:00

pid.c

…

profile.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

ptrace.c

…

range.c

…

reboot.c

…

relay.c

…

resource.c

…

seccomp.c

…

signal.c

signal: protect SIGNAL_UNKILLABLE from unintentional clearing.

2017-01-10 18:31:55 -08:00

smp.c

…

smpboot.c

…

smpboot.h

…

softirq.c

…

stacktrace.c

…

stop_machine.c

…

sys_ni.c

…

sys.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

sysctl_binary.c

…

sysctl.c

sysctl: fix proc_doulongvec_ms_jiffies_minmax()

2017-01-26 09:21:24 -08:00

task_work.c

…

taskstats.c

…

test_kprobes.c

…

torture.c

…

tracepoint.c

…

tsacct.c

…

ucount.c

userns: Make ucounts lock irq-safe

2017-01-24 06:23:51 +13:00

uid16.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

up.c

…

user_namespace.c

…

user-return-notifier.c

…

user.c

…

utsname_sysctl.c

…

utsname.c

…

watchdog_hld.c

kernel/watchdog: prevent false hardlockup on overloaded system

2017-01-24 16:26:14 -08:00

watchdog.c

kernel/watchdog: prevent false hardlockup on overloaded system

2017-01-24 16:26:14 -08:00

workqueue_internal.h

…

workqueue.c

…