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

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

Merge tag 'v4.6-rc3' into drm-intel-next-queued 



Linux 4.6-rc3

Backmerge requested by Chris Wilson to make his patches apply cleanly.
Tiny conflict in vmalloc.c with the (properly acked and all) patch in
drm-intel-next:

commit 4da56b99
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Mon Apr 4 14:46:42 2016 +0100

    mm/vmap: Add a notifier for when we run out of vmap address space

and Linus' tree.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents fb8621d3 bf162006

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ Björn Steinbrink <B.Steinbrink@gmx.de> 
Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Christoph Hellwig <hch@lst.de>

Christophe Ricard <christophe.ricard@gmail.com>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

David Brownell <david-b@pacbell.net>

CREDITS

+1 −0
Original line number Diff line number Diff line
@@ -3054,6 +3054,7 @@ D: PLX USB338x driver 
D: PCA9634 driver

D: Option GTM671WFS

D: Fintek F81216A

D: AD5761 iio driver

D: Various kernel hacks

S: Qtechnology A/S

S: Valby Langgade 142

Documentation/ABI/testing/sysfs-gpio→Documentation/ABI/obsolete/sysfs-gpio

+3 −1
Original line number Diff line number Diff line 
What:		/sys/class/gpio/

Date:		July 2008

KernelVersion:	2.6.27

Contact:	David Brownell <dbrownell@users.sourceforge.net>

Contact:	Linus Walleij <linusw@kernel.org>

Description:



  As a Kconfig option, individual GPIO signals may be accessed from
@@ -26,3 +26,5 @@ Description: 
	    /label ... (r/o) descriptive, not necessarily unique

	    /ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)



  This ABI is deprecated and will be removed after 2020. It is

  replaced with the GPIO character device.

Documentation/ABI/obsolete/sysfs-class-rfkill→Documentation/ABI/removed/sysfs-class-rfkill

+13 −0
Original line number Diff line number Diff line
@@ -2,28 +2,12 @@ rfkill - radio frequency (RF) connector kill switch support 


For details to this subsystem look at Documentation/rfkill.txt.



What:		/sys/class/rfkill/rfkill[0-9]+/state

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Current state of the transmitter.

		This file is deprecated and scheduled to be removed in 2014,

		because its not possible to express the 'soft and hard block'

		state of the rfkill driver.

Values: 	A numeric value.

		0: RFKILL_STATE_SOFT_BLOCKED

			transmitter is turned off by software

		1: RFKILL_STATE_UNBLOCKED

			transmitter is (potentially) active

		2: RFKILL_STATE_HARD_BLOCKED

			transmitter is forced off by something outside of

			the driver's control.



What:		/sys/class/rfkill/rfkill[0-9]+/claim

Date:		09-Jul-2007

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description:	This file is deprecated because there no longer is a way to

Description:	This file was deprecated because there no longer was a way to

		claim just control over a single rfkill instance.

		This file is scheduled to be removed in 2012.

		This file was scheduled to be removed in 2012, and was removed

		in 2016.

Values: 	0: Kernel handles events

Documentation/ABI/stable/firewire-cdev

+2 −1
Original line number Diff line number Diff line
@@ -100,4 +100,5 @@ Description: 


Users:		libraw1394

		libdc1394

		tools like jujuutils, fwhack, ...
 
		libhinawa

		tools like linux-firewire-utils, fwhack, ...