David S. Miller 2745529ac7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Couple conflicts resolved here: 1) In the MACB driver, a bug fix to properly initialize the RX tail pointer properly overlapped with some changes to support variable sized rings. 2) In XGBE we had a "CONFIG_PM" --> "CONFIG_PM_SLEEP" fix overlapping with a reorganization of the driver to support ACPI, OF, as well as PCI variants of the chip. 3) In 'net' we had several probe error path bug fixes to the stmmac driver, meanwhile a lot of this code was cleaned up and reorganized in 'net-next'. 4) The cls_flower classifier obtained a helper function in 'net-next' called __fl_delete() and this overlapped with Daniel Borkamann's bug fix to use RCU for object destruction in 'net'. It also overlapped with Jiri's change to guard the rhashtable_remove_fast() call with a check against tc_skip_sw(). 5) In mlx4, a revert bug fix in 'net' overlapped with some unrelated changes in 'net-next'. 6) In geneve, a stale header pointer after pskb_expand_head() bug fix in 'net' overlapped with a large reorganization of the same code in 'net-next'. Since the 'net-next' code no longer had the bug in question, there was nothing to do other than to simply take the 'net-next' hunks. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-12-03 12:29:53 -05:00
..
bpf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-12-03 12:29:53 -05:00
configs
debug
events	bpf: drop unnecessary context cast from BPF_PROG_RUN	2016-11-27 20:38:47 -05:00
gcov
irq	genirq: Use irq type from irqdata instead of irqdesc	2016-11-08 15:15:19 +01:00
livepatch
locking	lockdep: Limit static allocations if PROVE_LOCKING_SMALL is defined	2016-11-18 11:33:19 -08:00
power
printk	Revert "printk: make reading the kernel log flush pending lines"	2016-11-14 09:31:52 -08:00
rcu
sched	sched/autogroup: Do not use autogroup->tg in zombie threads	2016-11-22 12:33:43 +01:00
time
trace	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-22 13:27:16 -05:00
.gitignore
acct.c
async.c
audit_fsnotify.c
audit_tree.c
audit_watch.c
audit.c	audit: remove useless synchronize_net()	2016-12-01 11:29:02 -05:00
audit.h
auditfilter.c
auditsc.c
backtracetest.c
bounds.c
capability.c
cgroup_freezer.c
cgroup_pids.c
cgroup.c	cgroup: add support for eBPF programs	2016-11-25 16:25:52 -05:00
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	sched/autogroup: Do not use autogroup->tg in zombie threads	2016-11-22 12:33:43 +01:00
extable.c
fork.c
freezer.c
futex_compat.c
futex.c
groups.c
hung_task.c
irq_work.c
jump_label.c
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	Re-enable CONFIG_MODVERSIONS in a slightly weaker form	2016-11-29 16:01:30 -08:00
notifier.c
nsproxy.c
padata.c
panic.c
params.c
pid_namespace.c
pid.c
profile.c
ptrace.c
range.c
reboot.c
relay.c
resource.c
seccomp.c	bpf: drop unnecessary context cast from BPF_PROG_RUN	2016-11-27 20:38:47 -05: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-15 10:54:36 -05:00
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.c
workqueue_internal.h
workqueue.c