Merge branch 'linus' into x86/urgent, to pick up dependent commits

Browse source

We are going to fix a bug introduced by a more recent commit, so
refresh the tree.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2017-05-05 08:20:52 +02:00

parent 42fc6c6cb1 d3b5d35290

commit 415812f2d6

1748 changed files with 67485 additions and 54768 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

8

CREDITS

View file

8

Documentation/ABI/obsolete/sysfs-firmware-acpi

View file

10

Documentation/ABI/testing/sysfs-block

View file

10

Documentation/ABI/testing/sysfs-firmware-acpi

View file

162

Documentation/acpi/dsd/graph.txt

View file

10

Documentation/acpi/linuxized-acpica.txt

View file

2

Documentation/admin-guide/README.rst

View file

1

Documentation/admin-guide/kernel-parameters.rst

View file

10

Documentation/admin-guide/kernel-parameters.txt

View file

1

Documentation/arm64/silicon-errata.txt

View file

2

Documentation/block/00-INDEX

View file

531

Documentation/block/bfq-iosched.txt

View file

14

Documentation/block/kyber-iosched.txt

View file

11

Documentation/block/queue-sysfs.txt

View file

84

Documentation/blockdev/mflash.txt

View file

21

Documentation/devicetree/bindings/ata/ahci-dm816.txt

View file

25

Documentation/devicetree/bindings/hwmon/ads7828.txt

View file

68

Documentation/devicetree/bindings/hwmon/aspeed-pwm-tacho.txt

View file

30

Documentation/devicetree/bindings/hwmon/lm87.txt

View file

11

Documentation/devicetree/bindings/interrupt-controller/cortina,gemini-interrupt-controller.txt → Documentation/devicetree/bindings/interrupt-controller/faraday,ftintc010.txt

View file

35

Documentation/devicetree/bindings/interrupt-controller/mediatek,cirq.txt

View file

11

Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt

View file

4

Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt

View file

29

Documentation/devicetree/bindings/leds/leds-cpcap.txt

View file

60

Documentation/devicetree/bindings/leds/leds-mt6323.txt

View file

10

Documentation/devicetree/bindings/leds/leds-pca9532.txt

View file

59

Documentation/devicetree/bindings/mailbox/brcm,iproc-flexrm-mbox.txt

View file

6

Documentation/devicetree/bindings/mailbox/brcm,iproc-pdc-mbox.txt

View file

4

Documentation/devicetree/bindings/power/power_domain.txt

View file

17

Documentation/devicetree/bindings/power/reset/gemini-poweroff.txt

View file

11

Documentation/devicetree/bindings/power/reset/syscon-poweroff.txt

View file

1

Documentation/devicetree/bindings/power/rockchip-io-domain.txt

View file

37

Documentation/devicetree/bindings/power/supply/cpcap-charger.txt

View file

21

Documentation/devicetree/bindings/power/supply/lego_ev3_battery.txt

View file

6

Documentation/devicetree/bindings/power/supply/ltc2941.txt

View file

0

Documentation/devicetree/bindings/power/supply/max8925_batter.txt → Documentation/devicetree/bindings/power/supply/max8925_battery.txt

View file

22

Documentation/devicetree/bindings/timer/cortina,gemini-timer.txt

View file

33

Documentation/devicetree/bindings/timer/faraday,fttmr010.txt

View file

12

Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt

View file

1

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

1

Documentation/features/core/BPF-JIT/arch-support.txt

View file

1

Documentation/features/core/generic-idle-thread/arch-support.txt

View file

1

Documentation/features/core/jump-labels/arch-support.txt

View file

1

Documentation/features/core/tracehook/arch-support.txt

View file

1

Documentation/features/debug/KASAN/arch-support.txt

View file

1

Documentation/features/debug/gcov-profile-all/arch-support.txt

View file

1

Documentation/features/debug/kgdb/arch-support.txt

View file

1

Documentation/features/debug/kprobes-on-ftrace/arch-support.txt

View file

1

Documentation/features/debug/kprobes/arch-support.txt

View file

1

Documentation/features/debug/kretprobes/arch-support.txt

View file

1

Documentation/features/debug/optprobes/arch-support.txt

View file

1

Documentation/features/debug/stackprotector/arch-support.txt

View file

1

Documentation/features/debug/uprobes/arch-support.txt

View file

1

Documentation/features/debug/user-ret-profiler/arch-support.txt

View file

1

Documentation/features/io/dma-api-debug/arch-support.txt

View file

1

Documentation/features/io/dma-contiguous/arch-support.txt

View file

1

Documentation/features/io/sg-chain/arch-support.txt

View file

1

Documentation/features/lib/strncasecmp/arch-support.txt

View file

1

Documentation/features/locking/cmpxchg-local/arch-support.txt

View file

1

Documentation/features/locking/lockdep/arch-support.txt

View file

1

Documentation/features/locking/queued-rwlocks/arch-support.txt

View file

1

Documentation/features/locking/queued-spinlocks/arch-support.txt

View file

1

Documentation/features/locking/rwsem-optimized/arch-support.txt

View file

1

Documentation/features/perf/kprobes-event/arch-support.txt

View file

1

Documentation/features/perf/perf-regs/arch-support.txt

View file

1

Documentation/features/perf/perf-stackdump/arch-support.txt

View file

1

Documentation/features/sched/numa-balancing/arch-support.txt

View file

1

Documentation/features/seccomp/seccomp-filter/arch-support.txt

View file

1

Documentation/features/time/arch-tick-broadcast/arch-support.txt

View file

1

Documentation/features/time/clockevents/arch-support.txt

View file

1

Documentation/features/time/context-tracking/arch-support.txt

View file

1

Documentation/features/time/irq-time-acct/arch-support.txt

View file

1

Documentation/features/time/modern-timekeeping/arch-support.txt

View file

1

Documentation/features/time/virt-cpuacct/arch-support.txt

View file

1

Documentation/features/vm/ELF-ASLR/arch-support.txt

View file

1

Documentation/features/vm/PG_uncached/arch-support.txt

View file

1

Documentation/features/vm/THP/arch-support.txt

View file

1

Documentation/features/vm/TLB/arch-support.txt

View file

1

Documentation/features/vm/huge-vmap/arch-support.txt

View file

1

Documentation/features/vm/ioremap_prot/arch-support.txt

View file

1

Documentation/features/vm/numa-memblock/arch-support.txt

View file

1

Documentation/features/vm/pte_special/arch-support.txt

View file

22

Documentation/hwmon/aspeed-pwm-tacho

View file

2

Documentation/hwmon/tc654

View file

21

Documentation/lightnvm/pblk.txt

View file

2

Documentation/media/v4l-drivers/soc-camera.rst

View file

19

Documentation/power/runtime_pm.txt

View file

108

Documentation/scheduler/sched-pelt.c

View file

5

Documentation/trace/kprobetrace.txt

View file

100

Documentation/usb/usb3-debug-port.rst

View file

124

Documentation/x86/intel_rdt_ui.txt

View file

36

Documentation/x86/x86_64/mm.txt

View file

6

Documentation/x86/zero-page.txt

View file

43

MAINTAINERS

View file

7

arch/Kconfig

View file

55

arch/alpha/include/asm/extable.h

View file

16

arch/alpha/include/asm/futex.h

View file

305

arch/alpha/include/asm/uaccess.h

View file

4

arch/alpha/kernel/osf_sys.c

View file

152

arch/alpha/kernel/traps.c

View file

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