Merge branch 'linus' into x86/dma, to resolve a conflict with upstream

Browse source

Conflicts:
	arch/x86/mm/init_64.c

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

...

This commit is contained in:

Ingo Molnar 2018-03-24 09:25:26 +01:00

parent 0803e6051c 99fec39e77

commit ea2301b622

469 changed files with 4437 additions and 2471 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

167

Documentation/ABI/testing/sysfs-ata

View file

58

Documentation/ABI/testing/sysfs-block-device

View file

89

Documentation/ABI/testing/sysfs-class-scsi_host

View file

1

Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt

View file

4

Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt

View file

50

Documentation/devicetree/bindings/net/dsa/marvell.txt

View file

6

Documentation/devicetree/bindings/net/renesas,ravb.txt

View file

2

Documentation/devicetree/bindings/usb/dwc2.txt

View file

1

Documentation/devicetree/bindings/usb/renesas_usb3.txt

View file

1

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

View file

1

Documentation/devicetree/bindings/usb/usb-xhci.txt

View file

18

Documentation/networking/segmentation-offloads.txt

View file

11

MAINTAINERS

View file

11

Makefile

View file

3

arch/arm64/kvm/guest.c

View file

10

arch/arm64/mm/mmu.c

View file

1

arch/h8300/include/asm/byteorder.h

View file

1

arch/microblaze/Kconfig

View file

2

arch/microblaze/Kconfig.platform

View file

1

arch/microblaze/include/asm/setup.h

View file

4

arch/microblaze/lib/fastcopy.S

View file

64

arch/microblaze/mm/init.c

View file

2

arch/mips/lantiq/Kconfig

View file

6

arch/mips/lantiq/xway/sysctrl.c

View file

42

arch/mips/ralink/mt7621.c

View file

7

arch/mips/ralink/reset.c

View file

41

arch/parisc/kernel/cache.c

View file

10

arch/powerpc/kvm/book3s_hv_rmhandlers.S

View file

19

arch/sparc/mm/tlb.c

View file

1

arch/x86/include/asm/vmx.h

View file

4

arch/x86/kvm/mmu.c

View file

9

arch/x86/kvm/vmx.c

View file

60

arch/x86/mm/init_64.c

View file

48

arch/x86/mm/pgtable.c

View file

3

arch/x86/net/bpf_jit_comp.c

View file

4

drivers/acpi/acpi_watchdog.c

View file

48

drivers/acpi/battery.c

View file

10

drivers/acpi/nfit/core.c

View file

10

drivers/acpi/numa.c

View file

4

drivers/ata/ahci.c

View file

10

drivers/ata/libahci.c

View file

2

drivers/ata/libahci_platform.c

View file

26

drivers/ata/libata-core.c

View file

3

drivers/ata/libata-eh.c

View file

12

drivers/ata/libata-scsi.c

View file

62

drivers/ata/sata_rcar.c

View file

6

drivers/auxdisplay/img-ascii-lcd.c

View file

6

drivers/auxdisplay/panel.c

View file

8

drivers/bluetooth/btusb.c

View file

13

drivers/bluetooth/hci_bcm.c

View file

12

drivers/clk/bcm/clk-bcm2835.c

View file

28

drivers/clk/clk-aspeed.c

View file

46

drivers/clk/clk.c

View file

2

drivers/clk/hisilicon/clk-hi3660-stub.c

View file

20

drivers/clk/imx/clk-imx51-imx53.c

View file

5

drivers/clk/qcom/apcs-msm8916.c

View file

6

drivers/clk/sunxi-ng/ccu-sun6i-a31.c

View file

2

drivers/clk/ti/clk-33xx.c

View file

2

drivers/clk/ti/clk-43xx.c

View file

2

drivers/clk/ti/clkctrl.c

View file

2

drivers/firmware/dcdbas.c

View file

4

drivers/firmware/efi/libstub/tpm.c

View file

29

drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c

View file

9

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

View file

2

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

View file

1

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

View file

2

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

View file

4

drivers/gpu/drm/amd/amdgpu/atombios_encoders.c

View file

5

drivers/gpu/drm/amd/amdgpu/atombios_encoders.h

View file

8

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

View file

8

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

View file

8

drivers/gpu/drm/amd/amdgpu/dce_v6_0.c

View file

8

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

View file

5

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

View file

2

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c

View file

8

drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h

View file

9

drivers/gpu/drm/amd/display/dc/dce/dce_opp.c

View file

16

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

View file

4

drivers/gpu/drm/ast/ast_tables.h

View file

7

drivers/gpu/drm/drm_framebuffer.c

View file

8

drivers/gpu/drm/i915/gvt/cmd_parser.c

View file

2

drivers/gpu/drm/i915/gvt/mmio_context.c

View file

71

drivers/gpu/drm/i915/gvt/scheduler.c

View file

5

drivers/gpu/drm/i915/gvt/scheduler.h

View file

16

drivers/gpu/drm/i915/i915_gem.c

View file

10

drivers/gpu/drm/i915/i915_sysfs.c

View file

7

drivers/gpu/drm/i915/intel_ddi.c

View file

10

drivers/gpu/drm/i915/intel_dp.c

View file

4

drivers/gpu/drm/i915/intel_hangcheck.c

View file

5

drivers/gpu/drm/imx/ipuv3-crtc.c

View file

10

drivers/gpu/drm/imx/ipuv3-plane.c

View file

14

drivers/gpu/drm/nouveau/nouveau_backlight.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c

View file

29

drivers/gpu/drm/radeon/radeon_connectors.c

View file

2

drivers/gpu/drm/radeon/radeon_gem.c

View file

2

drivers/gpu/drm/radeon/radeon_object.c

View file

3

drivers/gpu/drm/sun4i/sun4i_drv.c

View file

6

drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

View file

5

drivers/gpu/drm/sun4i/sun4i_tcon.c

View file

16

drivers/gpu/drm/tegra/dc.c

View file

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