Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source

Minor SPDX change conflict.

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2019-06-22 08:59:24 -04:00

parent e0effb5fbd c356dc4b54

commit 92ad6325cb

5301 changed files with 7190 additions and 26605 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

.mailmap

View file

22

Documentation/ABI/testing/sysfs-bus-siox

View file

4

Documentation/driver-api/uio-howto.rst

View file

2

Documentation/fb/fbcon.txt

View file

48

Documentation/virtual/kvm/api.txt

View file

27

MAINTAINERS

View file

5

arch/arc/Kconfig

View file

5

arch/arc/Makefile

View file

5

arch/arc/boot/dts/axc001.dtsi

View file

5

arch/arc/boot/dts/axc003.dtsi

View file

5

arch/arc/boot/dts/axc003_idu.dtsi

View file

5

arch/arc/boot/dts/axs101.dts

View file

5

arch/arc/boot/dts/axs103.dts

View file

5

arch/arc/boot/dts/axs103_idu.dts

View file

5

arch/arc/boot/dts/axs10x_mb.dtsi

View file

5

arch/arc/boot/dts/haps_hs.dts

View file

5

arch/arc/boot/dts/haps_hs_idu.dts

View file

5

arch/arc/boot/dts/hsdk.dts

View file

5

arch/arc/boot/dts/nsim_700.dts

View file

5

arch/arc/boot/dts/nsim_hs.dts

View file

5

arch/arc/boot/dts/nsim_hs_idu.dts

View file

5

arch/arc/boot/dts/nsimosci.dts

View file

5

arch/arc/boot/dts/nsimosci_hs.dts

View file

5

arch/arc/boot/dts/nsimosci_hs_idu.dts

View file

5

arch/arc/boot/dts/skeleton.dtsi

View file

5

arch/arc/boot/dts/skeleton_hs.dtsi

View file

5

arch/arc/boot/dts/skeleton_hs_idu.dtsi

View file

5

arch/arc/boot/dts/vdk_axc003.dtsi

View file

5

arch/arc/boot/dts/vdk_axc003_idu.dtsi

View file

5

arch/arc/boot/dts/vdk_axs10x_mb.dtsi

View file

5

arch/arc/boot/dts/vdk_hs38.dts

View file

5

arch/arc/boot/dts/vdk_hs38_smp.dts

View file

5

arch/arc/include/asm/arcregs.h

View file

5

arch/arc/include/asm/asm-offsets.h

View file

5

arch/arc/include/asm/atomic.h

View file

5

arch/arc/include/asm/barrier.h

View file

5

arch/arc/include/asm/bitops.h

View file

5

arch/arc/include/asm/bug.h

View file

5

arch/arc/include/asm/cache.h

View file

5

arch/arc/include/asm/cacheflush.h

View file

5

arch/arc/include/asm/checksum.h

View file

5

arch/arc/include/asm/cmpxchg.h

View file

5

arch/arc/include/asm/current.h

View file

5

arch/arc/include/asm/delay.h

View file

5

arch/arc/include/asm/disasm.h

View file

5

arch/arc/include/asm/dma.h

View file

5

arch/arc/include/asm/dwarf.h

View file

5

arch/arc/include/asm/elf.h

View file

5

arch/arc/include/asm/entry-compact.h

View file

5

arch/arc/include/asm/entry.h

View file

5

arch/arc/include/asm/exec.h

View file

5

arch/arc/include/asm/futex.h

View file

6

arch/arc/include/asm/highmem.h

View file

5

arch/arc/include/asm/hugepage.h

View file

5

arch/arc/include/asm/io.h

View file

5

arch/arc/include/asm/irq.h

View file

5

arch/arc/include/asm/irqflags-arcv2.h

View file

5

arch/arc/include/asm/irqflags-compact.h

View file

5

arch/arc/include/asm/irqflags.h

View file

5

arch/arc/include/asm/kdebug.h

View file

5

arch/arc/include/asm/kgdb.h

View file

6

arch/arc/include/asm/kmap_types.h

View file

5

arch/arc/include/asm/kprobes.h

View file

5

arch/arc/include/asm/linkage.h

View file

5

arch/arc/include/asm/mach_desc.h

View file

5

arch/arc/include/asm/mmu.h

View file

5

arch/arc/include/asm/mmu_context.h

View file

5

arch/arc/include/asm/mmzone.h

View file

5

arch/arc/include/asm/module.h

View file

5

arch/arc/include/asm/page.h

View file

5

arch/arc/include/asm/pci.h

View file

6

arch/arc/include/asm/perf_event.h

View file

5

arch/arc/include/asm/pgalloc.h

View file

5

arch/arc/include/asm/pgtable.h

View file

5

arch/arc/include/asm/processor.h

View file

5

arch/arc/include/asm/ptrace.h

View file

5

arch/arc/include/asm/sections.h

View file

5

arch/arc/include/asm/segment.h

View file

5

arch/arc/include/asm/serial.h

View file

5

arch/arc/include/asm/setup.h

View file

5

arch/arc/include/asm/shmparam.h

View file

5

arch/arc/include/asm/smp.h

View file

5

arch/arc/include/asm/spinlock.h

View file

5

arch/arc/include/asm/spinlock_types.h

View file

5

arch/arc/include/asm/stacktrace.h

View file

5

arch/arc/include/asm/string.h

View file

5

arch/arc/include/asm/switch_to.h

View file

5

arch/arc/include/asm/syscall.h

View file

5

arch/arc/include/asm/syscalls.h

View file

5

arch/arc/include/asm/thread_info.h

View file

5

arch/arc/include/asm/timex.h

View file

5

arch/arc/include/asm/tlb-mmu1.h

View file

5

arch/arc/include/asm/tlb.h

View file

5

arch/arc/include/asm/tlbflush.h

View file

5

arch/arc/include/asm/uaccess.h

View file

5

arch/arc/include/asm/unaligned.h

View file

5

arch/arc/include/asm/unwind.h

View file

4

arch/arc/kernel/Makefile

View file

5

arch/arc/kernel/arc_hostlink.c

View file

6

arch/arc/kernel/arcksyms.c

View file

Some files were not shown because too many files have changed in this diff Show more