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

Commit 646db260 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'v4.3-rc2' into topic/drm-misc 



Backmerge Linux 4.3-rc2 because of conflicts in the dp helper code
between bugfixes and new code. Just adjacent lines really.

On top of that there's a silent conflict in the new fsl-dcu driver
merged into 4.3 and

commit 844f9111
Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date:   Wed Sep 2 10:42:40 2015 +0200

    drm/atomic: Make prepare_fb/cleanup_fb only take state, v3.

which Thierry Reding spotted and provided a fixup for.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents a645654b 1f93e4a9

.gitignore

+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
modules.builtin

Module.symvers

*.dwo

*.su



#

# Top-level generic files
@@ -44,6 +45,7 @@ Module.symvers 
/TAGS

/linux

/vmlinux

/vmlinux.32

/vmlinux-gdb.py

/vmlinuz

/System.map
@@ -89,6 +91,9 @@ GRTAGS 
GSYMS

GTAGS



# id-utils files

ID



*.orig

*~

\#*#
@@ -97,6 +102,7 @@ GTAGS 
# Leavings from module signing

#

extra_certificates

signing_key.pem

signing_key.priv

signing_key.x509

x509.genkey

CREDITS

+13 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ D: One of assisting postmasters for vger.kernel.org's lists 
S: (ask for current address)

S: Finland



N: Thomas Abraham

E: thomas.ab@samsung.com

D: Samsung pin controller driver



N: Dragos Acostachioaie

E: dragos@iname.com

W: http://www.arbornet.org/~dragos
@@ -2988,6 +2992,10 @@ S: 2200 Mission College Blvd 
S: Santa Clara, CA 95052

S: USA



N: Anil Ravindranath

E: anil_ravindranath@pmc-sierra.com

D: PMC-Sierra MaxRAID driver



N: Eric S. Raymond

E: esr@thyrsus.com

W: http://www.tuxedo.org/~esr/
@@ -3219,6 +3227,11 @@ S: 69 rue Dunois 
S: 75013 Paris

S: France



N: Aleksa Sarai

E: cyphar@cyphar.com

W: https://www.cyphar.com/

D: `pids` cgroup subsystem



N: Dipankar Sarma

E: dipankar@in.ibm.com

D: RCU

Documentation/ABI/stable/sysfs-bus-vmbus

0 → 100644
+29 −0
Original line number Diff line number Diff line 
What:		/sys/bus/vmbus/devices/vmbus_*/id

Date:		Jul 2009

KernelVersion:	2.6.31

Contact:	K. Y. Srinivasan <kys@microsoft.com>

Description:	The VMBus child_relid of the device's primary channel

Users:		tools/hv/lsvmbus



What:		/sys/bus/vmbus/devices/vmbus_*/class_id

Date:		Jul 2009

KernelVersion:	2.6.31

Contact:	K. Y. Srinivasan <kys@microsoft.com>

Description:	The VMBus interface type GUID of the device

Users:		tools/hv/lsvmbus



What:		/sys/bus/vmbus/devices/vmbus_*/device_id

Date:		Jul 2009

KernelVersion:	2.6.31

Contact:	K. Y. Srinivasan <kys@microsoft.com>

Description:	The VMBus interface instance GUID of the device

Users:		tools/hv/lsvmbus



What:		/sys/bus/vmbus/devices/vmbus_*/channel_vp_mapping

Date:		Jul 2015

KernelVersion:	4.2.0

Contact:	K. Y. Srinivasan <kys@microsoft.com>

Description:	The mapping of which primary/sub channels are bound to which

		Virtual Processors.

		Format: <channel's child_relid:the bound cpu's number>

Users:		tools/hv/lsvmbus

Documentation/ABI/testing/configfs-usb-gadget-loopback

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ Description: 
		The attributes:



		qlen		- depth of loopback queue

		bulk_buflen	- buffer length
 
		buflen		- buffer length

Documentation/ABI/testing/configfs-usb-gadget-sourcesink

+1 −1
Original line number Diff line number Diff line
@@ -9,4 +9,4 @@ Description: 
		isoc_maxpacket	- 0 - 1023 (fs), 0 - 1024 (hs/ss)

		isoc_mult	- 0..2 (hs/ss only)

		isoc_maxburst	- 0..15 (ss only)

		qlen		- buffer length
 
		buflen		- buffer length