David S. Miller 6e03f896b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/vxlan.c drivers/vhost/net.c include/linux/if_vlan.h net/core/dev.c The net/core/dev.c conflict was the overlap of one commit marking an existing function static whilst another was adding a new function. In the include/linux/if_vlan.h case, the type used for a local variable was changed in 'net', whereas the function got rewritten to fix a stacked vlan bug in 'net-next'. In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next' overlapped with an endainness fix for VHOST 1.0 in 'net'. In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter in 'net-next' whereas in 'net' there was a bug fix to pass in the correct network namespace pointer in calls to this function. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-02-05 14:33:28 -08:00
..
bpf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 13:55:36 -08:00
configs
debug	Surprising number of fixes this merge window :(	2015-01-23 06:40:36 +12:00
events	perf: Tighten (and fix) the grouping condition	2015-01-28 13:17:35 +01:00
gcov	gcov: enable GCOV_PROFILE_ALL from ARCH Kconfigs	2014-12-13 12:42:51 -08:00
irq	genirq: Prevent proc race against freeing of irq descriptors	2014-12-13 13:33:07 +01:00
locking	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00
power	PM: Eliminate CONFIG_PM_RUNTIME	2014-12-19 22:55:06 +01:00
printk	This code is a fork from the trace-3.19 pull as it needed the trace_seq	2014-12-13 14:04:41 -08:00
rcu
sched	sched: don't cause task state changes in nested sleep debugging	2015-02-01 12:23:32 -08:00
time	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
trace	This holds a few fixes to the ftrace infrastructure as well as	2015-01-17 07:55:52 +13:00
.gitignore
acct.c
async.c
audit.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-30 10:45:47 -08:00
audit.h
audit_tree.c	fsnotify: unify inode and mount marks handling	2014-12-13 12:42:53 -08:00
audit_watch.c
auditfilter.c	Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit	2014-12-23 18:13:16 -08:00
auditsc.c	Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit	2014-12-31 14:52:18 -08:00
backtracetest.c
bounds.c
capability.c
cgroup.c	cgroup: prevent mount hang due to memory controller lifetime	2015-01-22 10:26:43 -05:00
cgroup_freezer.c
compat.c
configs.c
context_tracking.c
cpu.c
cpu_pm.c
cpuset.c	Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup	2014-12-11 18:57:19 -08:00
crash_dump.c
cred.c
delayacct.c
dma.c
elfcore.c
exec_domain.c
exit.c	exit: fix race between wait_consider_task() and wait_task_zombie()	2015-01-08 15:10:51 -08:00
extable.c
fork.c	mm: use new helper functions around the i_mmap_mutex	2014-12-13 12:42:45 -08:00
freezer.c
futex.c
futex_compat.c
groups.c
hung_task.c
irq_work.c
jump_label.c
kallsyms.c
kcmp.c
Kconfig.freezer
Kconfig.hz
Kconfig.locks
Kconfig.preempt
kexec.c	kexec: remove unnecessary KERN_ERR from kexec.c	2014-12-13 12:42:51 -08:00
kmod.c	usermodehelper: kill the kmod_thread_locker logic	2014-12-10 17:41:17 -08:00
kprobes.c	module: remove mod arg from module_free, rename module_memfree().	2015-01-20 11:38:33 +10:30
ksysfs.c
kthread.c
latencytop.c
Makefile	kernel: res_counter: remove the unused API	2014-12-10 17:41:04 -08:00
module-internal.h
module.c	module: make module_refcount() a signed integer.	2015-01-22 11:15:54 +10:30
module_signing.c
notifier.c
nsproxy.c
padata.c
panic.c	kernel: add panic_on_warn	2014-12-10 17:41:10 -08:00
params.c	param: fix uninitialized read with CONFIG_DEBUG_LOCK_ALLOC	2015-01-20 11:38:31 +10:30
pid.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-12-16 15:53:03 -08:00
pid_namespace.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-12-16 15:53:03 -08:00
profile.c
ptrace.c	exit: ptrace: shift "reap dead" code from exit_ptrace() to forget_original_parent()	2014-12-10 17:41:10 -08:00
range.c	kernel: avoid overflow in cmp_range	2015-01-17 10:02:23 +13:00
reboot.c
relay.c
resource.c
seccomp.c
signal.c	Merge branch 'x86-mpx-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-12-10 09:34:43 -08:00
smp.c
smpboot.c
smpboot.h
softirq.c
stacktrace.c	stacktrace: introduce snprint_stack_trace for buffer output	2014-12-13 12:42:48 -08:00
stop_machine.c
sys.c	x86, mpx: Strictly enforce empty prctl() args	2015-01-22 21:11:06 +01:00
sys_ni.c	syscalls: implement execveat() system call	2014-12-13 12:42:51 -08:00
sysctl.c	As the merge window is still open, and this code was not as complex	2014-12-16 12:53:59 -08:00
sysctl_binary.c	kernel: add panic_on_warn	2014-12-10 17:41:10 -08:00
system_certificates.S
system_keyring.c
task_work.c
taskstats.c	netlink: make nlmsg_end() and genlmsg_end() void	2015-01-18 01:03:45 -05:00
test_kprobes.c
torture.c
tracepoint.c
tsacct.c
uid16.c
up.c
user-return-notifier.c
user.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2014-12-17 12:31:40 -08:00
user_namespace.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2014-12-17 12:31:40 -08:00
utsname.c
utsname_sysctl.c
watchdog.c
workqueue.c	workqueue: fix subtle pool management issue which can stall whole worker_pool	2015-01-16 14:21:16 -05:00
workqueue_internal.h