Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next
Conflicts: drivers/iommu/Kconfig drivers/iommu/Makefile
No related branches found
No related tags found
Showing
- arch/arm64/include/asm/kvm_host.h 0 additions, 3 deletionsarch/arm64/include/asm/kvm_host.h
- arch/arm64/include/asm/kvm_mmu.h 28 additions, 6 deletionsarch/arm64/include/asm/kvm_mmu.h
- arch/arm64/kvm/sys_regs.c 10 additions, 65 deletionsarch/arm64/kvm/sys_regs.c
- arch/avr32/mm/fault.c 2 additions, 0 deletionsarch/avr32/mm/fault.c
- arch/cris/mm/fault.c 2 additions, 0 deletionsarch/cris/mm/fault.c
- arch/frv/mm/fault.c 2 additions, 0 deletionsarch/frv/mm/fault.c
- arch/ia64/mm/fault.c 2 additions, 0 deletionsarch/ia64/mm/fault.c
- arch/m32r/mm/fault.c 2 additions, 0 deletionsarch/m32r/mm/fault.c
- arch/m68k/mm/fault.c 2 additions, 0 deletionsarch/m68k/mm/fault.c
- arch/metag/mm/fault.c 2 additions, 0 deletionsarch/metag/mm/fault.c
- arch/microblaze/mm/fault.c 2 additions, 0 deletionsarch/microblaze/mm/fault.c
- arch/mips/mm/fault.c 2 additions, 0 deletionsarch/mips/mm/fault.c
- arch/mn10300/mm/fault.c 2 additions, 0 deletionsarch/mn10300/mm/fault.c
- arch/nios2/mm/fault.c 2 additions, 0 deletionsarch/nios2/mm/fault.c
- arch/openrisc/mm/fault.c 2 additions, 0 deletionsarch/openrisc/mm/fault.c
- arch/parisc/mm/fault.c 2 additions, 0 deletionsarch/parisc/mm/fault.c
- arch/powerpc/include/asm/fsl_pamu_stash.h 2 additions, 2 deletionsarch/powerpc/include/asm/fsl_pamu_stash.h
- arch/powerpc/mm/copro_fault.c 1 addition, 1 deletionarch/powerpc/mm/copro_fault.c
- arch/powerpc/mm/fault.c 2 additions, 0 deletionsarch/powerpc/mm/fault.c
- arch/powerpc/platforms/powernv/setup.c 1 addition, 1 deletionarch/powerpc/platforms/powernv/setup.c
Loading
Please register or sign in to comment