Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/ibm/ibmvnic.c
Signed-off-by:
Jakub Kicinski <kuba@kernel.org>
Showing
- Documentation/admin-guide/bootconfig.rst 15 additions, 5 deletionsDocumentation/admin-guide/bootconfig.rst
- Documentation/devicetree/bindings/net/can/tcan4x5x.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/net/can/tcan4x5x.txt
- Documentation/devicetree/bindings/net/nfc/nxp-nci.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/net/nfc/nxp-nci.txt
- Documentation/devicetree/bindings/net/nfc/pn544.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/net/nfc/pn544.txt
- Documentation/kbuild/llvm.rst 2 additions, 3 deletionsDocumentation/kbuild/llvm.rst
- MAINTAINERS 24 additions, 6 deletionsMAINTAINERS
- Makefile 2 additions, 4 deletionsMakefile
- arch/alpha/kernel/process.c 1 addition, 1 deletionarch/alpha/kernel/process.c
- arch/arm/kernel/process.c 1 addition, 1 deletionarch/arm/kernel/process.c
- arch/arm64/include/asm/daifflags.h 3 additions, 0 deletionsarch/arm64/include/asm/daifflags.h
- arch/arm64/include/asm/exception.h 5 additions, 0 deletionsarch/arm64/include/asm/exception.h
- arch/arm64/include/asm/ptrace.h 4 additions, 0 deletionsarch/arm64/include/asm/ptrace.h
- arch/arm64/include/asm/sysreg.h 1 addition, 1 deletionarch/arm64/include/asm/sysreg.h
- arch/arm64/kernel/entry-common.c 190 additions, 64 deletionsarch/arm64/kernel/entry-common.c
- arch/arm64/kernel/entry.S 22 additions, 56 deletionsarch/arm64/kernel/entry.S
- arch/arm64/kernel/irq.c 0 additions, 15 deletionsarch/arm64/kernel/irq.c
- arch/arm64/kernel/process.c 5 additions, 5 deletionsarch/arm64/kernel/process.c
- arch/arm64/kernel/sdei.c 4 additions, 3 deletionsarch/arm64/kernel/sdei.c
- arch/arm64/kernel/syscall.c 0 additions, 1 deletionarch/arm64/kernel/syscall.c
- arch/arm64/kernel/traps.c 10 additions, 12 deletionsarch/arm64/kernel/traps.c
Please register or sign in to comment