Merge branch 'x86/urgent' into x86/hyperv

Browse source

Integrate the upstream bug fix to resolve the resulting conflict in
__send_ipi_mask().

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

...

This commit is contained in:

Thomas Gleixner 2018-07-06 12:35:56 +02:00

parent 58ec5e9c90 1268ed0c47

commit 8f63e9230d

457 changed files with 3234 additions and 2180 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

14

Documentation/admin-guide/pm/intel_pstate.rst

View file

23

Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt

View file

7

Documentation/filesystems/Locking

View file

13

Documentation/filesystems/vfs.txt

View file

6

Documentation/kbuild/kconfig-language.txt

View file

112

Documentation/networking/e100.rst

View file

76

Documentation/networking/e1000.rst

View file

2

Documentation/networking/strparser.txt

View file

2

Documentation/usb/gadget_configfs.txt

View file

27

MAINTAINERS

View file

2

Makefile

View file

5

arch/alpha/Kconfig

View file

2

arch/alpha/lib/Makefile

View file

44

arch/alpha/lib/dec_and_lock.c

View file

8

arch/arm/Kconfig

View file

2

arch/arm/boot/dts/armada-385-synology-ds116.dts

View file

24

arch/arm/boot/dts/bcm-cygnus.dtsi

View file

24

arch/arm/boot/dts/bcm-hr2.dtsi

View file

32

arch/arm/boot/dts/bcm-nsp.dtsi

View file

2

arch/arm/boot/dts/bcm5301x.dtsi

View file

6

arch/arm/boot/dts/da850.dtsi

View file

2

arch/arm/boot/dts/imx6q.dtsi

View file

2

arch/arm/boot/dts/imx6sx.dtsi

View file

4

arch/arm/boot/dts/socfpga.dtsi

View file

5

arch/arm/boot/dts/socfpga_arria10.dtsi

View file

2

arch/arm/common/Makefile

View file

390

arch/arm/configs/multi_v7_defconfig

View file

4

arch/arm/kernel/signal.c

View file

1

arch/arm/mach-bcm/Kconfig

View file

2

arch/arm/mach-davinci/board-da850-evm.c

View file

1

arch/arm/mach-socfpga/Kconfig

View file

6

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

View file

15

arch/arm64/boot/dts/amlogic/meson-axg-s400.dts

View file

4

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

View file

12

arch/arm64/boot/dts/amlogic/meson-gx.dtsi

View file

2

arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi

View file

3

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts

View file

7

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi

View file

8

arch/arm64/boot/dts/amlogic/meson-gxl.dtsi

View file

8

arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi

View file

4

arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts

View file

4

arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts

View file

4

arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi

View file

2

arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts

View file

2

arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts

View file

2

arch/arm64/boot/dts/marvell/armada-cp110.dtsi

View file

2

arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

View file

4

arch/arm64/boot/dts/qcom/msm8916.dtsi

View file

2

arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts

View file

2

arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts

View file

110

arch/arm64/configs/defconfig

View file

7

arch/arm64/include/asm/alternative.h

View file

6

arch/arm64/include/asm/pgtable.h

View file

51

arch/arm64/kernel/alternative.c

View file

5

arch/arm64/kernel/module.c

View file

7

arch/microblaze/Kconfig.debug

View file

5

arch/microblaze/include/asm/setup.h

View file

2

arch/microblaze/include/asm/unistd.h

View file

2

arch/microblaze/include/uapi/asm/unistd.h

View file

4

arch/microblaze/kernel/Makefile

View file

72

arch/microblaze/kernel/heartbeat.c

View file

29

arch/microblaze/kernel/platform.c

View file

11

arch/microblaze/kernel/reset.c

View file

2

arch/microblaze/kernel/syscall_table.S

View file

7

arch/microblaze/kernel/timer.c

View file

4

arch/mips/kernel/signal.c

View file

6

arch/parisc/Kconfig

View file

4

arch/parisc/Makefile

View file

8

arch/parisc/include/asm/signal.h

View file

3

arch/parisc/include/uapi/asm/unistd.h

View file

25

arch/parisc/kernel/drivers.c

View file

1

arch/parisc/kernel/syscall_table.S

View file

4

arch/parisc/kernel/unwind.c

View file

1

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

View file

1

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

View file

1

arch/powerpc/include/asm/systbl.h

View file

2

arch/powerpc/include/asm/unistd.h

View file

1

arch/powerpc/include/uapi/asm/unistd.h

View file

4

arch/powerpc/kernel/pci_32.c

View file

4

arch/powerpc/kernel/pci_64.c

View file

4

arch/powerpc/kernel/rtas.c

View file

4

arch/powerpc/kernel/signal.c

View file

8

arch/powerpc/kernel/signal_32.c

View file

4

arch/powerpc/kernel/signal_64.c

View file

4

arch/powerpc/kernel/syscalls.c

View file

4

arch/powerpc/mm/subpage-prot.c

View file

29

arch/powerpc/platforms/powermac/time.c

View file

6

arch/x86/Makefile

View file

2

arch/x86/boot/compressed/eboot.c

View file

2

arch/x86/entry/common.c

View file

2

arch/x86/entry/entry_32.S

View file

16

arch/x86/entry/entry_64_compat.S

View file

5

arch/x86/hyperv/hv_apic.c

View file

5

arch/x86/hyperv/hv_init.c

View file

59

arch/x86/include/asm/asm.h

View file

2

arch/x86/include/asm/barrier.h

View file

2

arch/x86/include/asm/irqflags.h

View file

5

arch/x86/include/asm/mshyperv.h

View file

3

arch/x86/include/asm/pgalloc.h

View file

2

arch/x86/include/asm/pgtable.h

View file

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