Merge commit 'e7bdea7750'

Browse source

Needed in order to work on top of pNFS changes in Linus' upstream kernel.

...

This commit is contained in:

Trond Myklebust 2016-07-24 12:51:10 -04:00

parent 297fae4d0b e7bdea7750

commit dc05973b28

653 changed files with 5866 additions and 3590 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

6

.mailmap

View file

1

CREDITS

View file

58

Documentation/ABI/testing/configfs-usb-gadget-uvc

View file

2

Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

View file

4

Documentation/leds/leds-class.txt

View file

8

Documentation/scsi/scsi_eh.txt

View file

72

MAINTAINERS

View file

4

Makefile

View file

7

arch/Kconfig

View file

4

arch/alpha/include/asm/pgalloc.h

View file

4

arch/arc/include/asm/pgalloc.h

View file

1

arch/arm/boot/dts/Makefile

View file

2

arch/arm/boot/dts/am437x-sk-evm.dts

View file

32

arch/arm/boot/dts/am57xx-idk-common.dtsi

View file

8

arch/arm/boot/dts/dm8148-evm.dts

View file

9

arch/arm/boot/dts/dm8148-t410.dts

View file

2

arch/arm/boot/dts/dra7.dtsi

View file

4

arch/arm/boot/dts/dra74x.dtsi

View file

13

arch/arm/boot/dts/exynos5250-snow-common.dtsi

View file

13

arch/arm/boot/dts/exynos5420-peach-pit.dts

View file

2

arch/arm/boot/dts/omap3-evm-37xx.dts

View file

1

arch/arm/boot/dts/omap3-igep.dtsi

View file

11

arch/arm/boot/dts/omap3-igep0020-common.dtsi

View file

4

arch/arm/boot/dts/omap3-n900.dts

View file

6

arch/arm/boot/dts/omap3-n950-n9.dtsi

View file

6

arch/arm/boot/dts/omap3-zoom3.dts

View file

48

arch/arm/boot/dts/omap5-board-common.dtsi

View file

26

arch/arm/boot/dts/omap5-igep0050.dts

View file

10

arch/arm/boot/dts/omap5-uevm.dts

View file

1

arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts

View file

3

arch/arm/boot/dts/stih407-family.dtsi

View file

2

arch/arm/boot/dts/sun6i-a31s-primo81.dts

View file

2

arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts

View file

1

arch/arm/configs/exynos_defconfig

View file

1

arch/arm/configs/multi_v7_defconfig

View file

2

arch/arm/include/asm/pgalloc.h

View file

1

arch/arm/include/asm/pgtable-2level.h

View file

5

arch/arm/include/asm/pgtable-3level.h

View file

1

arch/arm/include/asm/pgtable.h

View file

2

arch/arm/kernel/smp.c

View file

1

arch/arm/mach-exynos/Kconfig

View file

2

arch/arm/mach-imx/mach-imx6ul.c

View file

6

arch/arm/mach-omap1/ams-delta-fiq-handler.S

View file

5

arch/arm/mach-omap1/ams-delta-fiq.c

View file

2

arch/arm/mach-omap1/include/mach/ams-delta-fiq.h

View file

12

arch/arm/mach-omap2/Kconfig

View file

1

arch/arm/mach-omap2/omap-secure.h

View file

48

arch/arm/mach-omap2/omap-smp.c

View file

9

arch/arm/mach-omap2/powerdomain.c

View file

76

arch/arm/mach-omap2/powerdomains7xx_data.c

View file

7

arch/arm/mach-omap2/timer.c

View file

2

arch/arm/plat-samsung/devs.c

View file

2

arch/arm64/Makefile

View file

2

arch/arm64/boot/dts/lg/lg1312.dtsi

View file

2

arch/arm64/boot/dts/rockchip/rk3399.dtsi

View file

45

arch/arm64/include/asm/kgdb.h

View file

2

arch/arm64/include/asm/pgalloc.h

View file

12

arch/arm64/include/asm/smp.h

View file

42

arch/arm64/include/asm/spinlock.h

View file

6

arch/arm64/kernel/hibernate.c

View file

14

arch/arm64/kernel/kgdb.c

View file

18

arch/arm64/kernel/smp.c

View file

26

arch/arm64/kernel/traps.c

View file

9

arch/arm64/mm/context.c

View file

2

arch/arm64/mm/fault.c

View file

4

arch/arm64/mm/flush.c

View file

6

arch/avr32/include/asm/pgalloc.h

View file

4

arch/cris/include/asm/pgalloc.h

View file

6

arch/frv/mm/pgalloc.c

View file

4

arch/hexagon/include/asm/pgalloc.h

View file

2

arch/ia64/Kconfig

View file

8

arch/ia64/include/asm/thread_info.h

View file

1

arch/ia64/kernel/init_task.c

View file

4

arch/m68k/include/asm/mcf_pgalloc.h

View file

4

arch/m68k/include/asm/motorola_pgalloc.h

View file

4

arch/m68k/include/asm/sun3_pgalloc.h

View file

5

arch/metag/include/asm/pgalloc.h

View file

4

arch/microblaze/include/asm/pgalloc.h

View file

3

arch/microblaze/mm/pgtable.c

View file

3

arch/mips/include/asm/kvm_host.h

View file

6

arch/mips/include/asm/pgalloc.h

View file

19

arch/mips/kvm/emulate.c

View file

1

arch/mips/kvm/interrupt.h

View file

1

arch/mips/kvm/locore.S

View file

11

arch/mips/kvm/mips.c

View file

2

arch/mn10300/include/asm/thread_info.h

View file

3

arch/mn10300/kernel/kgdb.c

View file

6

arch/mn10300/mm/pgtable.c

View file

5

arch/nios2/include/asm/pgalloc.h

View file

2

arch/openrisc/include/asm/pgalloc.h

View file

2

arch/openrisc/mm/ioremap.c

View file

7

arch/parisc/include/asm/pgalloc.h

View file

2

arch/powerpc/Kconfig

View file

1

arch/powerpc/include/asm/book3s/32/pgalloc.h

View file

1

arch/powerpc/include/asm/book3s/64/mmu-hash.h

View file

28

arch/powerpc/include/asm/book3s/64/pgalloc.h

View file

15

arch/powerpc/include/asm/book3s/64/radix.h

View file

3

arch/powerpc/include/asm/book3s/64/tlbflush-radix.h

View file

14

arch/powerpc/include/asm/book3s/64/tlbflush.h

View file

5

arch/powerpc/include/asm/book3s/pgalloc.h

View file

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