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

Commit 5a2dd72a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into irq/genirq

parents efdc64f0 7cb36b6c
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ Christoph Hellwig <hch@lst.de>
Corey Minyard <minyard@acm.org>
Corey Minyard <minyard@acm.org>
David Brownell <david-b@pacbell.net>
David Brownell <david-b@pacbell.net>
David Woodhouse <dwmw2@shinybook.infradead.org>
David Woodhouse <dwmw2@shinybook.infradead.org>
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Domen Puncer <domen@coderock.org>
Domen Puncer <domen@coderock.org>
Douglas Gilbert <dougg@torque.net>
Douglas Gilbert <dougg@torque.net>
Ed L. Cashin <ecashin@coraid.com>
Ed L. Cashin <ecashin@coraid.com>
+26 −12
Original line number Original line Diff line number Diff line
@@ -369,10 +369,10 @@ P: 1024/8462A731 4C 55 86 34 44 59 A7 99 2B 97 88 4A 88 9A 0D 97
D: sun4 port, Sparc hacker
D: sun4 port, Sparc hacker


N: Hugh Blemings
N: Hugh Blemings
E: hugh@misc.nu
E: hugh@blemings.org
W: http://misc.nu/hugh/
W: http://blemings.org/hugh
D: Author and maintainer of the Keyspan USB to Serial drivers
D: Original author of the Keyspan USB to serial drivers, random PowerPC hacker
S: Po Box 234
S: PO Box 234
S: Belconnen ACT 2616
S: Belconnen ACT 2616
S: Australia
S: Australia


@@ -464,6 +464,11 @@ S: 1200 Goldenrod Dr.
S: Nampa, Idaho 83686
S: Nampa, Idaho 83686
S: USA
S: USA


N: Dirk J. Brandewie
E: dirk.j.brandewie@intel.com
E: linux-wimax@intel.com
D: Intel Wireless WiMAX Connection 2400 SDIO driver

N: Derrick J. Brashear
N: Derrick J. Brashear
E: shadow@dementia.org
E: shadow@dementia.org
W: http://www.dementia.org/~shadow
W: http://www.dementia.org/~shadow
@@ -1681,7 +1686,7 @@ E: ajoshi@shell.unixbox.com
D: fbdev hacking
D: fbdev hacking


N: Jesper Juhl
N: Jesper Juhl
E: jesper.juhl@gmail.com
E: jj@chaosbits.net
D: Various fixes, cleanups and minor features all over the tree.
D: Various fixes, cleanups and minor features all over the tree.
D: Wrote initial version of the hdaps driver (since passed on to others).
D: Wrote initial version of the hdaps driver (since passed on to others).
S: Lemnosvej 1, 3.tv
S: Lemnosvej 1, 3.tv
@@ -2119,6 +2124,11 @@ N: H.J. Lu
E: hjl@gnu.ai.mit.edu
E: hjl@gnu.ai.mit.edu
D: GCC + libraries hacker
D: GCC + libraries hacker


N: Yanir Lubetkin
E: yanirx.lubatkin@intel.com
E: linux-wimax@intel.com
D: Intel Wireless WiMAX Connection 2400 driver

N: Michal Ludvig
N: Michal Ludvig
E: michal@logix.cz
E: michal@logix.cz
E: michal.ludvig@asterisk.co.nz
E: michal.ludvig@asterisk.co.nz
@@ -2693,6 +2703,13 @@ S: RR #5, 497 Pole Line Road
S: Thunder Bay, Ontario
S: Thunder Bay, Ontario
S: CANADA P7C 5M9
S: CANADA P7C 5M9


N: Inaky Perez-Gonzalez
E: inaky.perez-gonzalez@intel.com
E: linux-wimax@intel.com
E: inakypg@yahoo.com
D: WiMAX stack
D: Intel Wireless WiMAX Connection 2400 driver

N: Yuri Per
N: Yuri Per
E: yuri@pts.mipt.ru
E: yuri@pts.mipt.ru
D: Some smbfs fixes
D: Some smbfs fixes
@@ -3769,14 +3786,11 @@ S: The Netherlands


N: David Woodhouse
N: David Woodhouse
E: dwmw2@infradead.org
E: dwmw2@infradead.org
D: ARCnet stuff, Applicom board driver, SO_BINDTODEVICE,
D: JFFS2 file system, Memory Technology Device subsystem,
D: some Alpha platform porting from 2.0, Memory Technology Devices,
D: Acquire watchdog timer, PC speaker driver maintenance,
D: various other stuff that annoyed me by not working.
D: various other stuff that annoyed me by not working.
S: c/o Red Hat Engineering
S: c/o Intel Corporation
S: Rustat House
S: Pipers Way
S: 60 Clifton Road
S: Swindon. SN3 1RJ
S: Cambridge. CB1 7EG
S: England
S: England


N: Chris Wright
N: Chris Wright
+60 −76
Original line number Original line Diff line number Diff line
@@ -3,8 +3,9 @@ Date: April 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		state. This holds the regulator output state.
		state. This reports the regulator enable status, for
		regulators which can report that value.


		This will be one of the following strings:
		This will be one of the following strings:


@@ -18,7 +19,8 @@ Description:
		'disabled' means the regulator output is OFF and is not
		'disabled' means the regulator output is OFF and is not
		supplying power to the system..
		supplying power to the system..


		'unknown' means software cannot determine the state.
		'unknown' means software cannot determine the state, or
		the reported state is invalid.


		NOTE: this field can be used in conjunction with microvolts
		NOTE: this field can be used in conjunction with microvolts
		and microamps to determine regulator output levels.
		and microamps to determine regulator output levels.
@@ -53,9 +55,10 @@ Date: April 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		microvolts. This holds the regulator output voltage setting
		microvolts. This holds the regulator output voltage setting
		measured in microvolts (i.e. E-6 Volts).
		measured in microvolts (i.e. E-6 Volts), for regulators
		which can report that voltage.


		NOTE: This value should not be used to determine the regulator
		NOTE: This value should not be used to determine the regulator
		output voltage level as this value is the same regardless of
		output voltage level as this value is the same regardless of
@@ -67,9 +70,10 @@ Date: April 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		microamps. This holds the regulator output current limit
		microamps. This holds the regulator output current limit
		setting measured in microamps (i.e. E-6 Amps).
		setting measured in microamps (i.e. E-6 Amps), for regulators
		which can report that current.


		NOTE: This value should not be used to determine the regulator
		NOTE: This value should not be used to determine the regulator
		output current level as this value is the same regardless of
		output current level as this value is the same regardless of
@@ -81,8 +85,9 @@ Date: April 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		opmode. This holds the regulator operating mode setting.
		opmode. This holds the current regulator operating mode,
		for regulators which can report it.


		The opmode value can be one of the following strings:
		The opmode value can be one of the following strings:


@@ -92,7 +97,7 @@ Description:
		'standby'
		'standby'
		'unknown'
		'unknown'


		The modes are described in include/linux/regulator/regulator.h
		The modes are described in include/linux/regulator/consumer.h


		NOTE: This value should not be used to determine the regulator
		NOTE: This value should not be used to determine the regulator
		output operating mode as this value is the same regardless of
		output operating mode as this value is the same regardless of
@@ -104,9 +109,10 @@ Date: April 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		min_microvolts. This holds the minimum safe working regulator
		min_microvolts. This holds the minimum safe working regulator
		output voltage setting for this domain measured in microvolts.
		output voltage setting for this domain measured in microvolts,
		for regulators which support voltage constraints.


		NOTE: this will return the string 'constraint not defined' if
		NOTE: this will return the string 'constraint not defined' if
		the power domain has no min microvolts constraint defined by
		the power domain has no min microvolts constraint defined by
@@ -118,9 +124,10 @@ Date: April 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		max_microvolts. This holds the maximum safe working regulator
		max_microvolts. This holds the maximum safe working regulator
		output voltage setting for this domain measured in microvolts.
		output voltage setting for this domain measured in microvolts,
		for regulators which support voltage constraints.


		NOTE: this will return the string 'constraint not defined' if
		NOTE: this will return the string 'constraint not defined' if
		the power domain has no max microvolts constraint defined by
		the power domain has no max microvolts constraint defined by
@@ -132,10 +139,10 @@ Date: April 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		min_microamps. This holds the minimum safe working regulator
		min_microamps. This holds the minimum safe working regulator
		output current limit setting for this domain measured in
		output current limit setting for this domain measured in
		microamps.
		microamps, for regulators which support current constraints.


		NOTE: this will return the string 'constraint not defined' if
		NOTE: this will return the string 'constraint not defined' if
		the power domain has no min microamps constraint defined by
		the power domain has no min microamps constraint defined by
@@ -147,10 +154,10 @@ Date: April 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		max_microamps. This holds the maximum safe working regulator
		max_microamps. This holds the maximum safe working regulator
		output current limit setting for this domain measured in
		output current limit setting for this domain measured in
		microamps.
		microamps, for regulators which support current constraints.


		NOTE: this will return the string 'constraint not defined' if
		NOTE: this will return the string 'constraint not defined' if
		the power domain has no max microamps constraint defined by
		the power domain has no max microamps constraint defined by
@@ -185,7 +192,7 @@ Date: April 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		requested_microamps. This holds the total requested load
		requested_microamps. This holds the total requested load
		current in microamps for this regulator from all its consumer
		current in microamps for this regulator from all its consumer
		devices.
		devices.
@@ -204,125 +211,102 @@ Date: May 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		suspend_mem_microvolts. This holds the regulator output
		suspend_mem_microvolts. This holds the regulator output
		voltage setting for this domain measured in microvolts when
		voltage setting for this domain measured in microvolts when
		the system is suspended to memory.
		the system is suspended to memory, for voltage regulators

		implementing suspend voltage configuration constraints.
		NOTE: this will return the string 'not defined' if
		the power domain has no suspend to memory voltage defined by
		platform code.


What:		/sys/class/regulator/.../suspend_disk_microvolts
What:		/sys/class/regulator/.../suspend_disk_microvolts
Date:		May 2008
Date:		May 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		suspend_disk_microvolts. This holds the regulator output
		suspend_disk_microvolts. This holds the regulator output
		voltage setting for this domain measured in microvolts when
		voltage setting for this domain measured in microvolts when
		the system is suspended to disk.
		the system is suspended to disk, for voltage regulators

		implementing suspend voltage configuration constraints.
		NOTE: this will return the string 'not defined' if
		the power domain has no suspend to disk voltage defined by
		platform code.


What:		/sys/class/regulator/.../suspend_standby_microvolts
What:		/sys/class/regulator/.../suspend_standby_microvolts
Date:		May 2008
Date:		May 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		suspend_standby_microvolts. This holds the regulator output
		suspend_standby_microvolts. This holds the regulator output
		voltage setting for this domain measured in microvolts when
		voltage setting for this domain measured in microvolts when
		the system is suspended to standby.
		the system is suspended to standby, for voltage regulators

		implementing suspend voltage configuration constraints.
		NOTE: this will return the string 'not defined' if
		the power domain has no suspend to standby voltage defined by
		platform code.


What:		/sys/class/regulator/.../suspend_mem_mode
What:		/sys/class/regulator/.../suspend_mem_mode
Date:		May 2008
Date:		May 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		suspend_mem_mode. This holds the regulator operating mode
		suspend_mem_mode. This holds the regulator operating mode
		setting for this domain when the system is suspended to
		setting for this domain when the system is suspended to
		memory.
		memory, for regulators implementing suspend mode

		configuration constraints.
		NOTE: this will return the string 'not defined' if
		the power domain has no suspend to memory mode defined by
		platform code.


What:		/sys/class/regulator/.../suspend_disk_mode
What:		/sys/class/regulator/.../suspend_disk_mode
Date:		May 2008
Date:		May 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		suspend_disk_mode. This holds the regulator operating mode
		suspend_disk_mode. This holds the regulator operating mode
		setting for this domain when the system is suspended to disk.
		setting for this domain when the system is suspended to disk,

		for regulators implementing suspend mode configuration
		NOTE: this will return the string 'not defined' if
		constraints.
		the power domain has no suspend to disk mode defined by
		platform code.


What:		/sys/class/regulator/.../suspend_standby_mode
What:		/sys/class/regulator/.../suspend_standby_mode
Date:		May 2008
Date:		May 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		suspend_standby_mode. This holds the regulator operating mode
		suspend_standby_mode. This holds the regulator operating mode
		setting for this domain when the system is suspended to
		setting for this domain when the system is suspended to
		standby.
		standby, for regulators implementing suspend mode

		configuration constraints.
		NOTE: this will return the string 'not defined' if
		the power domain has no suspend to standby mode defined by
		platform code.


What:		/sys/class/regulator/.../suspend_mem_state
What:		/sys/class/regulator/.../suspend_mem_state
Date:		May 2008
Date:		May 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		suspend_mem_state. This holds the regulator operating state
		suspend_mem_state. This holds the regulator operating state
		when suspended to memory.
		when suspended to memory, for regulators implementing suspend

		configuration constraints.
		This will be one of the following strings:


		'enabled'
		This will be one of the same strings reported by
		'disabled'
		the "state" attribute.
		'not defined'


What:		/sys/class/regulator/.../suspend_disk_state
What:		/sys/class/regulator/.../suspend_disk_state
Date:		May 2008
Date:		May 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		suspend_disk_state. This holds the regulator operating state
		suspend_disk_state. This holds the regulator operating state
		when suspended to disk.
		when suspended to disk, for regulators implementing

		suspend configuration constraints.
		This will be one of the following strings:


		'enabled'
		This will be one of the same strings reported by
		'disabled'
		the "state" attribute.
		'not defined'


What:		/sys/class/regulator/.../suspend_standby_state
What:		/sys/class/regulator/.../suspend_standby_state
Date:		May 2008
Date:		May 2008
KernelVersion:	2.6.26
KernelVersion:	2.6.26
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
Description:
Description:
		Each regulator directory will contain a field called
		Some regulator directories will contain a field called
		suspend_standby_state. This holds the regulator operating
		suspend_standby_state. This holds the regulator operating
		state when suspended to standby.
		state when suspended to standby, for regulators implementing

		suspend configuration constraints.
		This will be one of the following strings:


		'enabled'
		This will be one of the same strings reported by
		'disabled'
		the "state" attribute.
		'not defined'
+8 −6
Original line number Original line Diff line number Diff line
@@ -32,14 +32,16 @@ Contact: linux-usb@vger.kernel.org
Description:
Description:
                Write:
                Write:


                <channel> [<bpst offset>]
                <channel>


                to start beaconing on a specific channel, or stop
                to force a specific channel to be used when beaconing,
                beaconing if <channel> is -1.  Valid channels depends
                or, if <channel> is -1, to prohibit beaconing.  If
                on the radio controller's supported band groups.
                <channel> is 0, then the default channel selection
                algorithm will be used.  Valid channels depends on the
                radio controller's supported band groups.


                <bpst offset> may be used to try and join a specific
                Reading returns the currently active channel, or -1 if
                beacon group if more than one was found during a scan.
                the radio controller is not beaconing.


What:           /sys/class/uwb_rc/uwbN/scan
What:           /sys/class/uwb_rc/uwbN/scan
Date:           July 2008
Date:           July 2008
+50 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,6 @@ Description:
		internal state of the kernel memory blocks. Files could be
		internal state of the kernel memory blocks. Files could be
		added or removed dynamically to represent hot-add/remove
		added or removed dynamically to represent hot-add/remove
		operations.
		operations.

Users:		hotplug memory add/remove tools
Users:		hotplug memory add/remove tools
		https://w3.opensource.ibm.com/projects/powerpc-utils/
		https://w3.opensource.ibm.com/projects/powerpc-utils/


@@ -19,6 +18,56 @@ Description:
		This is useful for a user-level agent to determine
		This is useful for a user-level agent to determine
		identify removable sections of the memory before attempting
		identify removable sections of the memory before attempting
		potentially expensive hot-remove memory operation
		potentially expensive hot-remove memory operation
Users:		hotplug memory remove tools
		https://w3.opensource.ibm.com/projects/powerpc-utils/

What:		/sys/devices/system/memory/memoryX/phys_device
Date:		September 2008
Contact:	Badari Pulavarty <pbadari@us.ibm.com>
Description:
		The file /sys/devices/system/memory/memoryX/phys_device
		is read-only and is designed to show the name of physical
		memory device.  Implementation is currently incomplete.


What:		/sys/devices/system/memory/memoryX/phys_index
Date:		September 2008
Contact:	Badari Pulavarty <pbadari@us.ibm.com>
Description:
		The file /sys/devices/system/memory/memoryX/phys_index
		is read-only and contains the section ID in hexadecimal
		which is equivalent to decimal X contained in the
		memory section directory name.

What:		/sys/devices/system/memory/memoryX/state
Date:		September 2008
Contact:	Badari Pulavarty <pbadari@us.ibm.com>
Description:
		The file /sys/devices/system/memory/memoryX/state
		is read-write.  When read, it's contents show the
		online/offline state of the memory section.  When written,
		root can toggle the the online/offline state of a removable
		memory section (see removable file description above)
		using the following commands.
		# echo online > /sys/devices/system/memory/memoryX/state
		# echo offline > /sys/devices/system/memory/memoryX/state

		For example, if /sys/devices/system/memory/memory22/removable
		contains a value of 1 and
		/sys/devices/system/memory/memory22/state contains the
		string "online" the following command can be executed by
		by root to offline that section.
		# echo offline > /sys/devices/system/memory/memory22/state
Users:		hotplug memory remove tools
Users:		hotplug memory remove tools
		https://w3.opensource.ibm.com/projects/powerpc-utils/
		https://w3.opensource.ibm.com/projects/powerpc-utils/

What:		/sys/devices/system/node/nodeX/memoryY
Date:		September 2008
Contact:	Gary Hade <garyhade@us.ibm.com>
Description:
		When CONFIG_NUMA is enabled
		/sys/devices/system/node/nodeX/memoryY is a symbolic link that
		points to the corresponding /sys/devices/system/memory/memoryY
		memory section directory.  For example, the following symbolic
		link is created for memory section 9 on node0.
		/sys/devices/system/node/node0/memory9 -> ../../memory/memory9
Loading