Commit 1102c660 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into perf/urgent 



Merge reason: Linus applied an overlapping commit:

  5f2e8e2b: kernel/watchdog.c: Use proper ANSI C prototypes

So merge it in to make sure we can iterate the file without conflicts.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 6e9101ae 4db70f73

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ modules.builtin 
include/config

include/linux/version.h

include/generated

arch/*/include/generated



# stgit generated dirs

patches-*

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ Brian Avery <b.avery@hp.com> 
Brian King <brking@us.ibm.com>

Christoph Hellwig <hch@lst.de>

Corey Minyard <minyard@acm.org>

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

David Brownell <david-b@pacbell.net>

David Woodhouse <dwmw2@shinybook.infradead.org>

Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

CREDITS

+9 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ S: Haifa, Israel 
N: Johannes Berg

E: johannes@sipsolutions.net

W: http://johannes.sipsolutions.net/

P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5

P: 4096R/7BF9099A C0EB C440 F6DA 091C 884D  8532 E0F3 73F3 7BF9 099A

D: powerpc & 802.11 hacker



N: Stephen R. van den Berg (AKA BuGless)
@@ -2943,6 +2943,10 @@ S: Kasarmikatu 11 A4 
S: 70110 Kuopio

S: Finland



N: Tobias Ringström

E: tori@unhappy.mine.nu

D: Davicom DM9102(A)/DM9132/DM9801 fast ethernet driver



N: Luca Risolia

E: luca.risolia@studio.unibo.it

P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958  5D40 99DA 5D2A FCE6 35A4
@@ -3913,6 +3917,10 @@ S: Flandernstrasse 101 
S: D-73732 Esslingen

S: Germany



N: Roman Zippel

E: zippel@linux-m68k.org

D: AFFS and HFS filesystems, m68k maintainer, new kernel configuration in 2.5



N: Leonard N. Zubkoff

W: http://www.dandelion.com/Linux/

D: BusLogic SCSI driver

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/startup_profile

Date:		October 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The integer value of this attribute ranges from 0-4.

                When read, this attribute returns the number of the actual

                profile. This value is persistent, so its equivalent to the

                profile that's active when the mouse is powered on next time.

		When written, this file sets the number of the startup profile

		and the mouse activates this profile immediately.

		Please use actual_profile, it does the same thing.

Documentation/ABI/testing/sysfs-block

+64 −0
Original line number Diff line number Diff line
@@ -142,3 +142,67 @@ Description: 
		with the previous I/O request are enabled. When set to 2,

		all merge tries are disabled. The default value is 0 -

		which enables all types of merge tries.



What:		/sys/block/<disk>/discard_alignment

Date:		May 2011

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Devices that support discard functionality may

		internally allocate space in units that are bigger than

		the exported logical block size. The discard_alignment

		parameter indicates how many bytes the beginning of the

		device is offset from the internal allocation unit's

		natural alignment.



What:		/sys/block/<disk>/<partition>/discard_alignment

Date:		May 2011

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Devices that support discard functionality may

		internally allocate space in units that are bigger than

		the exported logical block size. The discard_alignment

		parameter indicates how many bytes the beginning of the

		partition is offset from the internal allocation unit's

		natural alignment.



What:		/sys/block/<disk>/queue/discard_granularity

Date:		May 2011

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Devices that support discard functionality may

		internally allocate space using units that are bigger

		than the logical block size. The discard_granularity

		parameter indicates the size of the internal allocation

		unit in bytes if reported by the device. Otherwise the

		discard_granularity will be set to match the device's

		physical block size. A discard_granularity of 0 means

		that the device does not support discard functionality.



What:		/sys/block/<disk>/queue/discard_max_bytes

Date:		May 2011

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Devices that support discard functionality may have

		internal limits on the number of bytes that can be

		trimmed or unmapped in a single operation. Some storage

		protocols also have inherent limits on the number of

		blocks that can be described in a single command. The

		discard_max_bytes parameter is set by the device driver

		to the maximum number of bytes that can be discarded in

		a single operation. Discard requests issued to the

		device must not exceed this limit. A discard_max_bytes

		value of 0 means that the device does not support

		discard functionality.



What:		/sys/block/<disk>/queue/discard_zeroes_data

Date:		May 2011

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Devices that support discard functionality may return

		stale or random data when a previously discarded block

		is read back. This can cause problems if the filesystem

		expects discarded blocks to be explicitly cleared. If a

		device reports that it deterministically returns zeroes

		when a discarded area is read the discard_zeroes_data

		parameter will be set to one. Otherwise it will be 0 and

		the result of reading a discarded area is undefined.