David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

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

2016-08-18 01:17:32 -04:00

..

bpf

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

2016-08-18 01:17:32 -04:00

configs

…

debug

…

events

perf/core: Set cgroup in CPU contexts for new cgroup events

2016-08-10 13:05:52 +02:00

gcov

…

irq

genirq/msi: Make sure PCI MSIs are activated early

2016-08-09 09:19:32 +02:00

livepatch

…

locking

locking/pvqspinlock: Fix a bug in qstat_read()

2016-08-10 14:13:29 +02:00

power

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

2016-08-12 22:53:58 +02:00

printk

Revert "printk: create pr_<level> functions"

2016-08-09 10:48:18 -07:00

rcu

…

sched

sched/cputime: Fix omitted ticks passed in parameter

2016-08-11 16:34:37 +02:00

time

timers: Fix get_next_timer_interrupt() computation

2016-08-09 09:31:55 +02:00

trace

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

2016-08-18 01:17:32 -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

…

cgroup_freezer.c

…

cgroup_pids.c

…

cgroup.c

…

compat.c

…

configs.c

…

context_tracking.c

…

cpu_pm.c

…

cpu.c

…

cpuset.c

…

crash_dump.c

…

cred.c

…

delayacct.c

…

dma.c

…

elfcore.c

…

exec_domain.c

…

exit.c

…

extable.c

…

fork.c

…

freezer.c

…

futex_compat.c

…

futex.c

…

groups.c

…

hung_task.c

…

irq_work.c

…

jump_label.c

Merge tag 'powerpc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2016-08-05 09:00:54 -04: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

…

kprobes.c

…

ksysfs.c

…

kthread.c

…

latencytop.c

…

Makefile

…

membarrier.c

…

memremap.c

…

module_signing.c

…

module-internal.h

…

module.c

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2016-08-04 09:14:38 -04:00

notifier.c

…

nsproxy.c

…

padata.c

…

panic.c

…

params.c

…

pid_namespace.c

…

pid.c

…

profile.c

…

ptrace.c

tree-wide: replace config_enabled() with IS_ENABLED()

2016-08-04 08:50:07 -04:00

range.c

…

reboot.c

…

relay.c

…

resource.c

…

seccomp.c

tree-wide: replace config_enabled() with IS_ENABLED()

2016-08-04 08:50:07 -04:00

signal.c

…

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

…

uid16.c

…

up.c

…

user_namespace.c

…

user-return-notifier.c

…

user.c

…

utsname_sysctl.c

…

utsname.c

…

watchdog.c

…

workqueue_internal.h

…

workqueue.c

…