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

Commit 447a8b85 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus 

Prepare first round of input updates for 3.18.
parents 3049683e 042e1c79

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
*.gcno

modules.builtin

Module.symvers

*.dwo



#

# Top-level generic files

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -62,6 +62,11 @@ Jeff Garzik <jgarzik@pretzel.yyz.us> 
Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

John Stultz <johnstul@us.ibm.com>

<josh@joshtriplett.org> <josh@freedesktop.org>

<josh@joshtriplett.org> <josh@kernel.org>

<josh@joshtriplett.org> <josht@linux.vnet.ibm.com>

<josh@joshtriplett.org> <josht@us.ibm.com>

<josh@joshtriplett.org> <josht@vnet.ibm.com>

Juha Yrjola <at solidboot.com>

Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

CREDITS

+11 −3
Original line number Diff line number Diff line
@@ -1381,6 +1381,9 @@ S: 17 rue Danton 
S: F - 94270 Le Kremlin-Bicêtre

S: France



N: Jack Hammer

D: IBM ServeRAID RAID (ips) driver maintenance



N: Greg Hankins

E: gregh@cc.gatech.edu

D: fixed keyboard driver to separate LED and locking status
@@ -1691,6 +1694,10 @@ S: Reading 
S: RG6 2NU

S: United Kingdom



N: Dave Jeffery

E: dhjeffery@gmail.com

D: SCSI hacks and IBM ServeRAID RAID driver maintenance



N: Jakub Jelinek

E: jakub@redhat.com

W: http://sunsite.mff.cuni.cz/~jj
@@ -3511,10 +3518,11 @@ S: MacGregor A.C.T 2615 
S: Australia



N: Josh Triplett

E: josh@freedesktop.org

P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87  CA26 189B 9946 D0FE 7AFB

D: rcutorture maintainer

E: josh@joshtriplett.org

P: 4096R/8AFF873D 758E 5042 E397 4BA3 3A9C  1E67 0ED9 A3DF 8AFF 873D

D: RCU and rcutorture

D: lock annotations, finding and fixing lock bugs

D: kernel tinification



N: Winfried Trümper

E: winni@xpilot.org

Documentation/ABI/stable/sysfs-bus-usb

+7 −7
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ Date: May 2007 
KernelVersion:	2.6.23

Contact:	Alan Stern <stern@rowland.harvard.edu>

Description:

		If CONFIG_USB_PERSIST is set, then each USB device directory

		will contain a file named power/persist.  The file holds a

		boolean value (0 or 1) indicating whether or not the

		"USB-Persist" facility is enabled for the device.  Since the

		facility is inherently dangerous, it is disabled by default

		for all devices except hubs.  For more information, see

		Documentation/usb/persist.txt.

		USB device directories can contain a file named power/persist.

		The file holds a boolean value (0 or 1) indicating whether or

		not the "USB-Persist" facility is enabled for the device.  For

		hubs this facility is always enabled and their device

		directories will not contain this file.



		For more information, see Documentation/usb/persist.txt.



What:		/sys/bus/usb/devices/.../power/autosuspend

Date:		March 2007

Documentation/ABI/testing/ima_policy

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ Description: 
			option:	[[appraise_type=]] [permit_directio]



		base: 	func:= [BPRM_CHECK][MMAP_CHECK][FILE_CHECK][MODULE_CHECK]

				[FIRMWARE_CHECK]

			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]

			fsmagic:= hex value

			fsuuid:= file system UUID (e.g 8bcbe394-4f13-4144-be8e-5aa9ea2ce2f6)
@@ -57,7 +58,8 @@ Description: 
			measure func=BPRM_CHECK

			measure func=FILE_MMAP mask=MAY_EXEC

			measure func=FILE_CHECK mask=MAY_READ uid=0

			measure func=MODULE_CHECK uid=0

			measure func=MODULE_CHECK

			measure func=FIRMWARE_CHECK

			appraise fowner=0



		The default policy measures all executables in bprm_check,