David S. Miller 9f0d34bc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c drivers/net/usb/sr9800.c drivers/net/usb/usbnet.c include/linux/usb/usbnet.h net/ipv4/tcp_ipv4.c net/ipv6/tcp_ipv6.c The TCP conflicts were overlapping changes. In 'net' we added a READ_ONCE() to the socket cached RX route read, whilst in 'net-next' Eric Dumazet touched the surrounding code dealing with how mini sockets are handled. With USB, it's a case of the same bug fix first going into net-next and then I cherry picked it back into net. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-04-02 16:16:53 -04:00
..
bpf	tc: bpf: generalize pedit action	2015-03-29 13:26:54 -07:00
configs	…
debug	debug: prevent entering debug mode on panic/exception.	2015-02-19 12:39:03 -06:00
events	perf: Fix irq_work 'tail' recursion	2015-03-23 10:46:32 +01:00
gcov	…
irq	genirq / PM: Add flag for shared NO_SUSPEND interrupt lines	2015-03-04 21:42:19 +01:00
livepatch	livepatch: Fix subtle race with coming and going modules	2015-03-17 10:31:54 +01:00
locking	lockdep: Fix the module unload key range freeing logic	2015-03-23 10:49:07 +01:00
power	PM / sleep: Re-implement suspend-to-idle handling	2015-02-13 23:49:36 +01:00
printk	console: Fix console name size mismatch	2015-03-07 03:39:55 +01:00
rcu	Merge branches 'core-urgent-for-linus' and 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-02-21 10:36:06 -08:00
sched	Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-03-28 11:17:32 -07:00
time	timers/tick/broadcast-hrtimer: Fix suspicious RCU usage in idle loop	2015-03-23 10:50:05 +01:00
trace	ftrace: Fix ftrace enable ordering of sysctl ftrace_enabled	2015-03-09 10:55:34 -04:00
.gitignore	…
Kconfig.freezer	…
Kconfig.hz	…
Kconfig.locks	…
Kconfig.preempt	…
Makefile	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2015-02-11 20:25:11 -08:00
acct.c	new fs_pin killing logics	2015-01-25 23:17:28 -05:00
async.c	…
audit.c	…
audit.h	audit: replace getname()/putname() hacks with reference counters	2015-01-23 00:23:58 -05:00
audit_tree.c	…
audit_watch.c	…
auditfilter.c	Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit	2015-02-11 20:07:47 -08:00
auditsc.c	Merge branch 'getname2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-02-17 15:27:47 -08:00
backtracetest.c	…
bounds.c	…
capability.c	…
cgroup.c	kernfs: remove KERNFS_STATIC_NAME	2015-02-13 21:21:36 -08:00
cgroup_freezer.c	…
compat.c	all arches, signal: move restart_block to struct task_struct	2015-02-12 18:54:12 -08:00
configs.c	…
context_tracking.c	…
cpu.c	…
cpu_pm.c	…
cpuset.c	cpuset: Fix cpuset sched_relax_domain_level	2015-03-02 11:55:04 -05:00
crash_dump.c	…
cred.c	…
delayacct.c	…
dma.c	…
elfcore.c	…
exec_domain.c	…
exit.c	oom, PM: make OOM detection in the freezer path raceless	2015-02-11 17:06:03 -08:00
extable.c	…
fork.c	mm: do not use mm->nr_pmds on !MMU configurations	2015-02-12 18:54:10 -08:00
freezer.c	…
futex.c	all arches, signal: move restart_block to struct task_struct	2015-02-12 18:54:12 -08:00
futex_compat.c	…
groups.c	…
hung_task.c	…
irq_work.c	…
jump_label.c	…
kallsyms.c	…
kcmp.c	…
kexec.c	kexec: simplify conditional	2015-02-17 14:34:51 -08:00
kmod.c	…
kprobes.c	kprobes: makes kprobes/enabled works correctly for optimized kprobes.	2015-02-13 21:21:42 -08:00
ksysfs.c	…
kthread.c	…
latencytop.c	…
module-internal.h	…
module.c	lockdep: Fix the module unload key range freeing logic	2015-03-23 10:49:07 +01:00
module_signing.c	…
notifier.c	…
nsproxy.c	…
padata.c	padata: use %*pb[l] to print bitmaps including cpumasks and nodemasks	2015-02-13 21:21:38 -08:00
panic.c	…
params.c	…
pid.c	…
pid_namespace.c	…
profile.c	profile: use %*pb[l] to print bitmaps including cpumasks and nodemasks	2015-02-13 21:21:38 -08:00
ptrace.c	ptrace: remove linux/compat.h inclusion under CONFIG_COMPAT	2015-02-17 14:34:51 -08:00
range.c	…
reboot.c	…
relay.c	…
resource.c	resources: Move struct resource_list_entry from ACPI into resource core	2015-02-05 15:09:25 +01:00
seccomp.c	seccomp: cap SECCOMP_RET_ERRNO data to MAX_ERRNO	2015-02-17 14:34:55 -08:00
signal.c	signal: use current->state helpers	2015-02-17 14:34:51 -08:00
smp.c	…
smpboot.c	smpboot: Add missing get_online_cpus() in smpboot_register_percpu_thread()	2015-01-23 11:33:51 +01:00
smpboot.h	…
softirq.c	Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-02-09 15:24:03 -08:00
stacktrace.c	…
stop_machine.c	…
sys.c	kernel/sys.c: fix UNAME26 for 4.0	2015-02-28 09:57:51 -08:00
sys_ni.c	…
sysctl.c	fs: add dirtytime_expire_seconds sysctl	2015-03-17 12:23:32 -04:00
sysctl_binary.c	…
system_certificates.S	…
system_keyring.c	…
task_work.c	…
taskstats.c	…
test_kprobes.c	…
torture.c	…
tracepoint.c	…
tsacct.c	…
uid16.c	…
up.c	…
user-return-notifier.c	…
user.c	…
user_namespace.c	…
utsname.c	…
utsname_sysctl.c	…
watchdog.c	kernel/sched/clock.c: add another clock for use with the soft lockup watchdog	2015-02-12 18:54:13 -08:00
workqueue.c	workqueue: fix hang involving racing cancel[_delayed]_work_sync()'s for PREEMPT_NONE	2015-03-05 08:04:13 -05:00
workqueue_internal.h	…