David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_alb.c drivers/net/ethernet/altera/altera_msgdma.c drivers/net/ethernet/altera/altera_sgdma.c net/ipv6/xfrm6_output.c Several cases of overlapping changes. The xfrm6_output.c has a bug fix which overlaps the renaming of skb->local_df to skb->ignore_df. In the Altera TSE driver cases, the register access cleanups in net-next overlapped with bug fixes done in net. Similarly a bug fix to send ALB packets in the bonding driver using the right source address overlaps with cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-24 00:32:30 -04:00
..
debug	mm: per-thread vma caching	2014-04-07 16:35:53 -07:00
events	perf: Fix a race between ring_buffer_detach() and ring_buffer_attach()	2014-05-19 21:44:56 +09:00
gcov	…
irq	genirq: x86: Ensure that dynamic irq allocation does not conflict	2014-04-28 12:20:00 +02:00
locking	asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*	2014-05-05 16:07:46 -07:00
power	asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*	2014-05-05 16:07:46 -07:00
printk	asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*	2014-05-05 16:07:46 -07:00
rcu	…
sched	Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-05-23 10:04:04 -07:00
time	tick-sched: Check tick_nohz_enabled in tick_nohz_switch_to_nohz()	2014-04-15 20:26:58 +02:00
trace	tracing: Use rcu_dereference_sched() for trace event triggers	2014-05-02 23:12:42 -04:00
.gitignore	…
Kconfig.freezer	…
Kconfig.hz	…
Kconfig.locks	…
Kconfig.preempt	…
Makefile	…
acct.c	…
async.c	…
audit.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-12 13:19:14 -04:00
audit.h	…
audit_tree.c	…
audit_watch.c	…
auditfilter.c	Merge git://git.infradead.org/users/eparis/audit	2014-04-12 12:38:53 -07:00
auditsc.c	Merge git://git.infradead.org/users/eparis/audit	2014-04-12 12:38:53 -07:00
backtracetest.c	…
bounds.c	…
capability.c	…
cgroup.c	cgroup: introduce task_css_is_root()	2014-05-13 11:26:27 -04:00
cgroup_freezer.c	cgroup: fix rcu_read_lock() leak in update_if_frozen()	2014-05-13 11:28:30 -04:00
compat.c	…
configs.c	…
context_tracking.c	asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*	2014-05-05 16:07:46 -07:00
cpu.c	…
cpu_pm.c	…
cpuset.c	…
crash_dump.c	…
cred.c	…
delayacct.c	…
dma.c	…
elfcore.c	…
exec_domain.c	…
exit.c	wait: WSTOPPED|WCONTINUED doesn't work if a zombie leader is traced by another process	2014-04-07 16:36:06 -07:00
extable.c	…
fork.c	kernel: use macros from compiler.h instead of __attribute__((...))	2014-04-07 16:36:11 -07:00
freezer.c	…
futex.c	futex: update documentation for ordering guarantees	2014-04-12 17:57:51 -07:00
futex_compat.c	…
groups.c	…
hrtimer.c	hrtimer: Set expiry time before switch_hrtimer_base()	2014-05-12 10:47:39 +02:00
hung_task.c	…
irq_work.c	…
itimer.c	…
jump_label.c	…
kallsyms.c	kernel: use macros from compiler.h instead of __attribute__((...))	2014-04-07 16:36:11 -07:00
kcmp.c	…
kexec.c	kernel: use macros from compiler.h instead of __attribute__((...))	2014-04-07 16:36:11 -07:00
kmod.c	…
kprobes.c	…
ksysfs.c	kernel: use macros from compiler.h instead of __attribute__((...))	2014-04-07 16:36:11 -07:00
kthread.c	…
latencytop.c	…
module-internal.h	…
module.c	Fixed one missing place for the new taint flag, and remove a warning	2014-05-01 10:35:01 -07:00
module_signing.c	…
notifier.c	…
nsproxy.c	…
padata.c	…
panic.c	kernel/panic.c: display reason at end + pr_emerg	2014-04-07 16:36:08 -07:00
params.c	…
pid.c	…
pid_namespace.c	…
posix-cpu-timers.c	…
posix-timers.c	…
profile.c	CPU hotplug notifiers registration fixes for 3.15-rc1	2014-04-07 14:55:46 -07:00
ptrace.c	…
range.c	…
reboot.c	…
relay.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-04-12 14:49:50 -07:00
res_counter.c	res_counter: remove interface for locked charging and uncharging	2014-04-07 16:35:54 -07:00
resource.c	…
seccomp.c	net: filter: cleanup invocation of internal BPF	2014-05-21 17:07:17 -04:00
signal.c	kernel: use macros from compiler.h instead of __attribute__((...))	2014-04-07 16:36:11 -07:00
smp.c	…
smpboot.c	…
smpboot.h	…
softirq.c	asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*	2014-05-05 16:07:46 -07:00
stacktrace.c	…
stop_machine.c	…
sys.c	mm, thp: add VM_INIT_DEF_MASK and PRCTL_THP_DISABLE	2014-04-07 16:35:52 -07:00
sys_ni.c	…
sysctl.c	ipv4: make ip_local_reserved_ports per netns	2014-05-14 15:31:45 -04:00
sysctl_binary.c	…
system_certificates.S	…
system_keyring.c	…
task_work.c	…
taskstats.c	…
test_kprobes.c	…
time.c	…
timeconst.bc	…
timer.c	timer: Prevent overflow in apply_slack	2014-04-30 13:46:17 +02:00
torture.c	…
tracepoint.c	tracepoint: Fix use of tracepoint funcs after rcu free	2014-05-08 09:10:56 -04:00
tsacct.c	…
uid16.c	…
up.c	…
user-return-notifier.c	…
user.c	…
user_namespace.c	user namespace: fix incorrect memory barriers	2014-04-14 16:03:02 -07:00
utsname.c	…
utsname_sysctl.c	…
watchdog.c	kernel/watchdog.c:touch_softlockup_watchdog(): use raw_cpu_write()	2014-04-18 16:40:08 -07:00
workqueue.c	workqueue: fix a possible race condition between rescuer and pwq-release	2014-04-18 12:33:29 -04:00
workqueue_internal.h	…