Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca6e4405 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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



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: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 8f539a83 ccfb8b2e

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ Mayuresh Janorkar <mayur@ti.com> 
Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Mitesh shah <mshah@teja.com>

Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>

Morten Welinder <terra@gnome.org>

Morten Welinder <welinder@anemone.rentec.com>

Morten Welinder <welinder@darter.rentec.com>
@@ -95,10 +96,12 @@ Patrick Mochel <mochel@digitalimplant.org> 
Peter A Jonsson <pj@ludd.ltu.se>

Peter Oruba <peter@oruba.de>

Peter Oruba <peter.oruba@amd.com>

Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Rajesh Shah <rajesh.shah@intel.com>

Ralf Baechle <ralf@linux-mips.org>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>

Rémi Denis-Courmont <rdenis@simphalempin.com>

Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>

Rudolf Marek <R.Marek@sh.cvut.cz>

CREDITS

+4 −5
Original line number Diff line number Diff line
@@ -2740,6 +2740,10 @@ S: C/ Mieses 20, 9-B 
S: Valladolid 47009

S: Spain



N: Jens Osterkamp

E: jens@de.ibm.com

D: Maintainer of Spidernet network driver for Cell



N: Gadi Oxman

E: gadio@netvision.net.il

D: Original author and maintainer of IDE/ATAPI floppy/tape drivers
@@ -3219,11 +3223,6 @@ N: Dipankar Sarma 
E: dipankar@in.ibm.com

D: RCU



N: Yoshinori Sato

E: ysato@users.sourceforge.jp

D: uClinux for Renesas H8/300 (H8300)

D: http://uclinux-h8.sourceforge.jp/



N: Hannu Savolainen

E: hannu@opensound.com

D: Maintainer of the sound drivers until 2.1.x days.

Documentation/ABI/stable/sysfs-bus-w1

0 → 100644
+11 −0
Original line number Diff line number Diff line 
What:		/sys/bus/w1/devices/.../w1_master_timeout_us

Date:		April 2015

Contact:	Dmitry Khromov <dk@icelogic.net>

Description:	Bus scanning interval, microseconds component.

		Some of 1-Wire devices commonly associated with physical access

		control systems are attached/generate presence for as short as

		100 ms - hence the tens-to-hundreds milliseconds scan intervals

		are required.

		see Documentation/w1/w1.generic for detailed information.

Users:		any user space application which wants to know bus scanning

		interval

Documentation/ABI/stable/sysfs-driver-w1_ds28ea00

0 → 100644
+6 −0
Original line number Diff line number Diff line 
What:		/sys/bus/w1/devices/.../w1_seq

Date:		Apr 2015

Contact:	Matt Campbell <mattrcampbell@gmail.com>

Description:	Support for the DS28EA00 chain sequence function

		see Documentation/w1/slaves/w1_therm for detailed information

Users:		any user space application which wants to communicate with DS28EA00

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

+1 −1
Original line number Diff line number Diff line 
What:		/config/pcie-gadget

Date:		Feb 2011

KernelVersion:	2.6.37

Contact:	Pratyush Anand <pratyush.anand@st.com>

Contact:	Pratyush Anand <pratyush.anand@gmail.com>

Description:



	Interface is used to configure selected dual mode PCIe controller