Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued

Browse source

Backmerge fixes since it's getting out of hand again with the massive
split due to atomic between -next and 4.2-rc. All the bugfixes in
4.2-rc are addressed already (by converting more towards atomic
instead of minimal duct-tape) so just always pick the version in next
for the conflicts in modeset code.

All the other conflicts are just adjacent lines changed.

Conflicts:
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/i915_gem_gtt.c
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_drv.h
	drivers/gpu/drm/i915/intel_ringbuffer.h

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

...

This commit is contained in:

Daniel Vetter 2015-07-15 16:36:50 +02:00

parent 8f539a83ef ccfb8b2ed4

commit ca6e440577

10035 changed files with 616580 additions and 265175 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

3

.mailmap

View file

9

CREDITS

View file

11

Documentation/ABI/stable/sysfs-bus-w1

View file

6

Documentation/ABI/stable/sysfs-driver-w1_ds28ea00

View file

2

Documentation/ABI/testing/configfs-spear-pcie-gadget

View file

9

Documentation/ABI/testing/dev-kmsg

View file

26

Documentation/ABI/testing/ima_policy

View file

11

Documentation/ABI/testing/sysfs-ata

View file

450

Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x

View file

12

Documentation/ABI/testing/sysfs-bus-fcoe

View file

99

Documentation/ABI/testing/sysfs-bus-iio

View file

7

Documentation/ABI/testing/sysfs-bus-iio-vf610

View file

16

Documentation/ABI/testing/sysfs-bus-mei

View file

8

Documentation/ABI/testing/sysfs-bus-pci-drivers-janz-cmodio

View file

12

Documentation/ABI/testing/sysfs-bus-usb-lvstest

View file

33

Documentation/ABI/testing/sysfs-class-cxl

View file

19

Documentation/ABI/testing/sysfs-class-net

View file

19

Documentation/ABI/testing/sysfs-class-net-janz-ican3

View file

109

Documentation/ABI/testing/sysfs-class-scsi_tape

View file

24

Documentation/ABI/testing/sysfs-class-zram

View file

2

Documentation/ABI/testing/sysfs-devices-system-cpu

View file

8

Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff

View file

20

Documentation/ABI/testing/sysfs-driver-toshiba_haps

View file

2

Documentation/ABI/testing/sysfs-firmware-dmi → Documentation/ABI/testing/sysfs-firmware-dmi-entries

View file

22

Documentation/ABI/testing/sysfs-firmware-dmi-tables

View file

10

Documentation/ABI/testing/sysfs-firmware-efi

View file

81

Documentation/ABI/testing/sysfs-firmware-efi-esrt

View file

8

Documentation/ABI/testing/sysfs-platform-twl4030-usb

View file

2

Documentation/CodingStyle

View file

31

Documentation/DMA-API-HOWTO.txt

View file

30

Documentation/DMA-API.txt

View file

67

Documentation/DocBook/crypto-API.tmpl

View file

2

Documentation/DocBook/kernel-hacking.tmpl

View file

1

Documentation/DocBook/media/.gitignore vendored

View file

88

Documentation/DocBook/media/Makefile

View file

6

Documentation/DocBook/media/dvb/audio.xml

View file

4

Documentation/DocBook/media/dvb/ca.xml

View file

61

Documentation/DocBook/media/dvb/demux.xml

View file

34

Documentation/DocBook/media/dvb/dvbapi.xml

View file

1113

Documentation/DocBook/media/dvb/dvbproperty.xml

View file

6

Documentation/DocBook/media/dvb/examples.xml

View file

78

Documentation/DocBook/media/dvb/fe-diseqc-recv-slave-reply.xml

View file

51

Documentation/DocBook/media/dvb/fe-diseqc-reset-overload.xml

View file

89

Documentation/DocBook/media/dvb/fe-diseqc-send-burst.xml

View file

72

Documentation/DocBook/media/dvb/fe-diseqc-send-master-cmd.xml

View file

61

Documentation/DocBook/media/dvb/fe-enable-high-lnb-voltage.xml

View file

266

Documentation/DocBook/media/dvb/fe-get-info.xml

View file

81

Documentation/DocBook/media/dvb/fe-get-property.xml

View file

107

Documentation/DocBook/media/dvb/fe-read-status.xml

View file

64

Documentation/DocBook/media/dvb/fe-set-frontend-tune-mode.xml

View file

91

Documentation/DocBook/media/dvb/fe-set-tone.xml

View file

69

Documentation/DocBook/media/dvb/fe-set-voltage.xml

View file

1727

Documentation/DocBook/media/dvb/frontend.xml

View file

654

Documentation/DocBook/media/dvb/frontend_legacy_api.xml

View file

30

Documentation/DocBook/media/dvb/intro.xml

View file

4

Documentation/DocBook/media/dvb/kdapi.xml

View file

374

Documentation/DocBook/media/dvb/net.xml

View file

10

Documentation/DocBook/media/dvb/video.xml

View file

28

Documentation/DocBook/media/typical_media_device.svg

View file

File diff suppressed because one or more lines are too long

Side by side After Width:  |  Height:  |  Size: 35 KiB

4

Documentation/DocBook/media/v4l/controls.xml

View file

24

Documentation/DocBook/media/v4l/io.xml

View file

2

Documentation/DocBook/media/v4l/media-func-open.xml

View file

81

Documentation/DocBook/media/v4l/pixfmt-y16-be.xml

View file

134

Documentation/DocBook/media/v4l/pixfmt.xml

View file

2

Documentation/DocBook/media/v4l/remote_controllers.xml

View file

12

Documentation/DocBook/media/v4l/subdev-formats.xml

View file

3

Documentation/DocBook/media/v4l/vidioc-create-bufs.xml

View file

12

Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml

View file

5

Documentation/DocBook/media/v4l/vidioc-dqevent.xml

View file

10

Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml

View file

3

Documentation/DocBook/media/v4l/vidioc-enum-frameintervals.xml

View file

3

Documentation/DocBook/media/v4l/vidioc-enum-framesizes.xml

View file

3

Documentation/DocBook/media/v4l/vidioc-expbuf.xml

View file

4

Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml

View file

11

Documentation/DocBook/media/v4l/vidioc-g-edid.xml

View file

2

Documentation/DocBook/media/v4l/vidioc-g-selection.xml

View file

10

Documentation/DocBook/media/v4l/vidioc-qbuf.xml

View file

3

Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml

View file

3

Documentation/DocBook/media/v4l/vidioc-querybuf.xml

View file

4

Documentation/DocBook/media/v4l/vidioc-reqbufs.xml

View file

3

Documentation/DocBook/media/v4l/vidioc-subscribe-event.xml

View file

53

Documentation/DocBook/media_api.tmpl

View file

2

Documentation/DocBook/scsi.tmpl

View file

2

Documentation/RCU/RTFP.txt

View file

20

Documentation/RCU/arrayRCU.txt

View file

10

Documentation/RCU/lockdep.txt

View file

38

Documentation/RCU/rcu_dereference.txt

View file

6

Documentation/RCU/whatisRCU.txt

View file

4

Documentation/SubmittingPatches

View file

57

Documentation/acpi/enumeration.txt

View file

17

Documentation/arm/CCN.txt

View file

53

Documentation/arm/Samsung/Bootloader-interface.txt

View file

32

Documentation/arm/stm32/overview.txt

View file

22

Documentation/arm/stm32/stm32f429-overview.txt

View file

18

Documentation/arm/sunxi/README

View file

2

Documentation/arm/vlocks.txt

View file

10

Documentation/arm64/booting.txt

View file

14

Documentation/blackfin/gptimers-example.c

View file

29

Documentation/blockdev/zram.txt

View file

83

Documentation/cgroups/blkio-controller.txt

View file

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