Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict resolution of af_smc.c from Stephen Rothwell.
Signed-off-by: 
David S. Miller <davem@davemloft.net>
Showing
- .clang-format 24 additions, 0 deletions.clang-format
- Documentation/networking/rxrpc.txt 9 additions, 7 deletionsDocumentation/networking/rxrpc.txt
- MAINTAINERS 15 additions, 2 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm64/include/asm/futex.h 8 additions, 8 deletionsarch/arm64/include/asm/futex.h
- arch/arm64/include/asm/module.h 5 additions, 0 deletionsarch/arm64/include/asm/module.h
- arch/arm64/kernel/ftrace.c 1 addition, 2 deletionsarch/arm64/kernel/ftrace.c
- arch/arm64/kernel/traps.c 9 additions, 6 deletionsarch/arm64/kernel/traps.c
- arch/mips/configs/generic/board-ocelot.config 8 additions, 0 deletionsarch/mips/configs/generic/board-ocelot.config
- arch/mips/kernel/kgdb.c 2 additions, 1 deletionarch/mips/kernel/kgdb.c
- arch/mips/sgi-ip27/ip27-irq.c 1 addition, 2 deletionsarch/mips/sgi-ip27/ip27-irq.c
- arch/powerpc/include/asm/mmu.h 1 addition, 1 deletionarch/powerpc/include/asm/mmu.h
- arch/powerpc/kernel/exceptions-64s.S 12 additions, 0 deletionsarch/powerpc/kernel/exceptions-64s.S
- arch/powerpc/kernel/head_32.S 0 additions, 8 deletionsarch/powerpc/kernel/head_32.S
- arch/powerpc/kernel/vdso32/gettimeofday.S 1 addition, 1 deletionarch/powerpc/kernel/vdso32/gettimeofday.S
- arch/riscv/configs/rv32_defconfig 84 additions, 0 deletionsarch/riscv/configs/rv32_defconfig
- arch/riscv/mm/init.c 8 additions, 0 deletionsarch/riscv/mm/init.c
- arch/sparc/kernel/pci_sun4v.c 11 additions, 9 deletionsarch/sparc/kernel/pci_sun4v.c
- arch/x86/events/amd/core.c 135 additions, 5 deletionsarch/x86/events/amd/core.c
- arch/x86/events/core.c 3 additions, 10 deletionsarch/x86/events/core.c
Loading
Please register or sign in to comment