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
..
crypto	…
hardware	ARM: removing support for etb/etm in "arch/arm/kernel/"	2014-11-07 15:19:33 -08:00
mach	arm: sa1100: move irda header to linux/platform_data	2014-12-30 18:44:07 -05:00
xen	xen/arm/arm64: introduce xen_arch_need_swiotlb	2014-12-04 12:41:54 +00:00
Kbuild	net, lib: kill arch_fast_hash library bits	2014-12-10 15:17:46 -05:00
arch_timer.h	clocksource: arch_timer: Fix code to use physical timers when requested	2014-12-04 23:30:26 -08:00
asm-offsets.h	…
assembler.h	…
atomic.h	locking,arch: Use ACCESS_ONCE() instead of cast to volatile in atomic_read()	2014-10-03 06:06:23 +02:00
bL_switcher.h	…
barrier.h	arch: Add lightweight memory barriers dma_rmb() and dma_wmb()	2014-12-11 21:15:06 -05:00
bitops.h	…
bug.h	…
bugs.h	…
cache.h	…
cacheflush.h	ARM: mm: allow text and rodata sections to be read-only	2014-10-16 14:38:54 -07:00
cachetype.h	…
checksum.h	…
clkdev.h	…
cmpxchg.h	…
compiler.h	…
cp15.h	…
cpu.h	…
cpuidle.h	cpuidle: Invert CPUIDLE_FLAG_TIME_VALID logic	2014-11-12 21:17:27 +01:00
cputype.h	ARM: 8130/1: cpuidle/cpuidle-big_little: fix reading cpu id part number	2014-08-27 15:40:45 +01:00
cti.h	…
dcc.h	…
delay.h	…
device.h	arm: introduce is_device_dma_coherent	2014-12-04 12:41:50 +00:00
div64.h	…
dma-contiguous.h	…
dma-iommu.h	…
dma-mapping.h	ARM: SoC/iommu configuration for 3.19	2014-12-16 14:53:01 -08:00
dma.h	…
domain.h	…
ecard.h	…
edac.h	…
elf.h	ARM: 8127/1: module: add support for R_ARM_TARGET1 relocations	2014-08-27 15:40:11 +01:00
entry-macro-multi.S	…
exception.h	…
fb.h	…
fiq.h	…
firmware.h	ARM: firmware: add AFTR mode support to firmware do_idle method	2014-10-21 00:06:35 +09:00
fixmap.h	arm: use fixmap for text patching when text is RO	2014-10-16 14:38:53 -07:00
flat.h	…
floppy.h	…
fncpy.h	…
fpstate.h	…
ftrace.h	ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h	2014-09-26 14:40:03 +01:00
futex.h	…
glue-cache.h	…
glue-df.h	…
glue-pf.h	…
glue-proc.h	…
glue.h	…
gpio.h	…
hardirq.h	…
highmem.h	…
hugetlb-3level.h	…
hugetlb.h	…
hw_breakpoint.h	…
hw_irq.h	ARM: 8218/1: warn if bad IRQ was scheduled	2014-11-27 16:15:33 +00:00
hwcap.h	…
hypervisor.h	…
ide.h	…
idmap.h	…
io.h	ARM: Use include/asm-generic/io.h	2014-11-10 15:59:23 +01:00
irq.h	…
irq_work.h	arm: Tell irq work about self IPI support	2014-09-13 18:38:39 +02:00
irqflags.h	…
jump_label.h	…
kexec.h	…
kgdb.h	…
kmap_types.h	…
kprobes.h	…
kvm_arm.h	…
kvm_asm.h	…
kvm_coproc.h	…
kvm_emulate.h	arm/arm64: KVM: Use set/way op trapping to track the state of the caches	2015-01-29 23:24:56 +01:00
kvm_host.h	arm/arm64: KVM: Use set/way op trapping to track the state of the caches	2015-01-29 23:24:56 +01:00
kvm_mmio.h	…
kvm_mmu.h	arm/arm64: KVM: Use kernel mapping to perform invalidation on page fault	2015-01-29 23:24:57 +01:00
kvm_psci.h	…
limits.h	…
linkage.h	…
mach-types.h	…
mc146818rtc.h	…
mcpm.h	ARM: 8240/1: MCPM: document mcpm_sync_init()	2014-12-03 16:00:06 +00:00
mcs_spinlock.h	…
memblock.h	…
memory.h	ARM: Use include/asm-generic/io.h	2014-11-10 15:59:23 +01:00
mmu.h	…
mmu_context.h	…
module.h	…
mpu.h	…
mtd-xip.h	…
mutex.h	…
neon.h	…
nwflash.h	…
opcodes-sec.h	…
opcodes-virt.h	…
opcodes.h	…
outercache.h	…
page-nommu.h	…
page.h	…
pci.h	…
percpu.h	ARM: 8174/1: Use global stack register variable for percpu	2014-11-13 23:58:06 +00:00
perf_event.h	arm: perf: factor out callchain code	2014-10-30 12:16:58 +00:00
pgalloc.h	ARM: 8235/1: Support for the PXN CPU feature on ARMv7	2014-12-03 15:57:45 +00:00
pgtable-2level-hwdef.h	ARM: 8235/1: Support for the PXN CPU feature on ARMv7	2014-12-03 15:57:45 +00:00
pgtable-2level-types.h	…
pgtable-2level.h	arm: mm: introduce special ptes for LPAE	2014-10-09 22:26:00 -04:00
pgtable-3level-hwdef.h	ARM: 8235/1: Support for the PXN CPU feature on ARMv7	2014-12-03 15:57:45 +00:00
pgtable-3level-types.h	…
pgtable-3level.h	arm: mm: enable RCU fast_gup	2014-10-09 22:26:01 -04:00
pgtable-hwdef.h	…
pgtable-nommu.h	…
pgtable.h	ARM: 8239/1: Introduce {set,clear}_pte_bit	2014-12-03 16:00:06 +00:00
pmu.h	arm: perf: fold hotplug notifier into arm_pmu	2014-10-30 12:17:01 +00:00
probes.h	…
proc-fns.h	…
processor.h	…
procinfo.h	…
prom.h	…
psci.h	…
ptrace.h	ARM: 8175/1: Use current_stack_pointer to calculate pt_regs address	2014-11-13 23:58:07 +00:00
seccomp.h	…
setup.h	…
shmparam.h	…
signal.h	…
smp.h	ARM: 8131/1: arm/smp: Absorb boot_secondary()	2014-08-27 15:44:13 +01:00
smp_plat.h	ARM: 8130/1: cpuidle/cpuidle-big_little: fix reading cpu id part number	2014-08-27 15:40:45 +01:00
smp_scu.h	…
smp_twd.h	…
sparsemem.h	…
spinlock.h	arm/spinlock: Replace ACCESS_ONCE with READ_ONCE	2014-12-18 09:54:40 +01:00
spinlock_types.h	…
stackprotector.h	…
stacktrace.h	…
string.h	…
suspend.h	…
swab.h	…
switch_to.h	…
sync_bitops.h	…
syscall.h	ARM: 8152/1: Convert pr_warning to pr_warn	2014-09-26 14:39:53 +01:00
system_info.h	…
system_misc.h	…
tcm.h	…
therm.h	…
thread_info.h	Merge branches 'fixes', 'misc', 'pm' and 'sa1100' into for-next	2014-12-05 16:30:47 +00:00
thread_notify.h	…
timex.h	…
tlb.h	arm: mm: enable HAVE_RCU_TABLE_FREE logic	2014-10-09 22:26:01 -04:00
tlbflush.h	…
tls.h	ARM: 8178/1: fix set_tls for !CONFIG_KUSER_HELPERS	2014-09-30 16:55:23 +01:00
topology.h	…
traps.h	…
trusted_foundations.h	…
types.h	…
uaccess.h	ARM: 8137/1: fix get_user BE behavior for target variable with size of 8 bytes	2014-09-12 17:38:59 +01:00
ucontext.h	…
unified.h	…
unistd.h	ARM: wire up getrandom syscall	2014-08-09 14:07:53 +01:00
unwind.h	…
uprobes.h	…
user.h	…
v7m.h	…
vfp.h	ARM: 8197/1: vfp: Fix VFPv3 hwcap detection on CPUID based cpus	2014-11-21 15:24:43 +00:00
vfpmacros.h	…
vga.h	…
virt.h	…
word-at-a-time.h	…
xor.h	…