Merge 5.0-rc6 into usb-next
We want the USB fixes in here, and this resolves a merge issue in the
uas driver.
Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Showing
- .mailmap 4 additions, 0 deletions.mailmap
- Documentation/features/debug/debug-vm-pgtable/arch-support.txt 1 addition, 1 deletion...entation/features/debug/debug-vm-pgtable/arch-support.txt
- MAINTAINERS 2 additions, 2 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm64/kernel/cpu_errata.c 6 additions, 2 deletionsarch/arm64/kernel/cpu_errata.c
- arch/arm64/kernel/paravirt.c 15 additions, 11 deletionsarch/arm64/kernel/paravirt.c
- arch/arm64/net/bpf_jit_comp.c 31 additions, 12 deletionsarch/arm64/net/bpf_jit_comp.c
- arch/ia64/include/asm/acpi.h 0 additions, 2 deletionsarch/ia64/include/asm/acpi.h
- arch/mips/Kconfig 1 addition, 0 deletionsarch/mips/Kconfig
- arch/mips/sni/a20r.c 7 additions, 2 deletionsarch/mips/sni/a20r.c
- arch/powerpc/Kconfig 0 additions, 1 deletionarch/powerpc/Kconfig
- arch/powerpc/configs/pasemi_defconfig 0 additions, 1 deletionarch/powerpc/configs/pasemi_defconfig
- arch/powerpc/configs/ppc6xx_defconfig 0 additions, 1 deletionarch/powerpc/configs/ppc6xx_defconfig
- arch/powerpc/include/asm/book3s/64/mmu.h 5 additions, 5 deletionsarch/powerpc/include/asm/book3s/64/mmu.h
- arch/powerpc/kernel/dma-iommu.c 2 additions, 1 deletionarch/powerpc/kernel/dma-iommu.c
- arch/powerpc/kernel/vdso32/Makefile 1 addition, 1 deletionarch/powerpc/kernel/vdso32/Makefile
- arch/powerpc/kernel/vdso32/vdso32.lds.S 0 additions, 1 deletionarch/powerpc/kernel/vdso32/vdso32.lds.S
- arch/powerpc/kernel/vdso64/Makefile 1 addition, 1 deletionarch/powerpc/kernel/vdso64/Makefile
- arch/powerpc/kernel/vdso64/vdso64.lds.S 1 addition, 2 deletionsarch/powerpc/kernel/vdso64/vdso64.lds.S
- arch/powerpc/mm/book3s64/radix_pgtable.c 0 additions, 15 deletionsarch/powerpc/mm/book3s64/radix_pgtable.c
Please register or sign in to comment