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

Commit aff36486 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'x86/numa' into x86-mm 



Merge reason: Pick up x86-32 remap allocator cleanup changes - 14
commits, 3fe14ab5^..993ba158.

  3fe14ab5: x86-32, numa: Fix failure condition check in alloc_remap()
  993ba158: x86-32, numa: Update remap allocator comments

Scheduled NUMA init 32/64bit unification changes depend on them.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents c7a7b814 993ba158

Documentation/00-INDEX

+2 −2
Original line number Diff line number Diff line
@@ -206,8 +206,8 @@ laptops/ 
	- directory with laptop related info and laptop driver documentation.

ldm.txt

	- a brief description of LDM (Windows Dynamic Disks).

leds-class.txt

	- documents LED handling under Linux.

leds/

	- directory with info about LED handling under Linux.

local_ops.txt

	- semantics and behavior of local atomic operations.

lockdep-design.txt

Documentation/ABI/testing/sysfs-driver-hid-roccat-kone

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid- 
Date:		March 2010

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

Description:	The mouse can store 5 profiles which can be switched by the

                press of a button. A profile holds informations like button

                press of a button. A profile holds information like button

                mappings, sensitivity, the colors of the 5 leds and light

                effects.

                When read, these files return the respective profile. The

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

+4 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ Date: August 2010 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_buttons holds informations about button layout.

		profile_buttons holds information about button layout.

		When written, this file lets one write the respective profile

		buttons back to the mouse. The data has to be 77 bytes long.

		The mouse will reject invalid data.
@@ -47,7 +47,7 @@ Date: August 2010 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_buttons holds informations about button layout.

		profile_buttons holds information about button layout.

		When read, these files return the respective profile buttons.

		The returned data is 77 bytes in size.

		This file is readonly.
@@ -58,7 +58,7 @@ Date: October 2010 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_settings holds informations like resolution, sensitivity

		profile_settings holds information like resolution, sensitivity

		and light effects.

		When written, this file lets one write the respective profile

		settings back to the mouse. The data has to be 43 bytes long.
@@ -73,7 +73,7 @@ Date: August 2010 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_settings holds informations like resolution, sensitivity

		profile_settings holds information like resolution, sensitivity

		and light effects.

		When read, these files return the respective profile settings.

		The returned data is 43 bytes in size.

Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus

+4 −4
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ Date: January 2011 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_buttons holds informations about button layout.

		profile_buttons holds information about button layout.

		When written, this file lets one write the respective profile

		buttons back to the mouse. The data has to be 23 bytes long.

		The mouse will reject invalid data.
@@ -66,7 +66,7 @@ Date: January 2011 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_buttons holds informations about button layout.

		profile_buttons holds information about button layout.

		When read, these files return the respective profile buttons.

		The returned data is 23 bytes in size.

		This file is readonly.
@@ -77,7 +77,7 @@ Date: January 2011 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_settings holds informations like resolution, sensitivity

		profile_settings holds information like resolution, sensitivity

		and light effects.

		When written, this file lets one write the respective profile

		settings back to the mouse. The data has to be 16 bytes long.
@@ -92,7 +92,7 @@ Date: January 2011 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_settings holds informations like resolution, sensitivity

		profile_settings holds information like resolution, sensitivity

		and light effects.

		When read, these files return the respective profile settings.

		The returned data is 16 bytes in size.

Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra

+4 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ Date: August 2010 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_settings holds informations like resolution, sensitivity

		profile_settings holds information like resolution, sensitivity

		and light effects.

		When written, this file lets one write the respective profile

		settings back to the mouse. The data has to be 13 bytes long.
@@ -54,7 +54,7 @@ Date: August 2010 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_settings holds informations like resolution, sensitivity

		profile_settings holds information like resolution, sensitivity

		and light effects.

		When read, these files return the respective profile settings.

		The returned data is 13 bytes in size.
@@ -66,7 +66,7 @@ Date: August 2010 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_buttons holds informations about button layout.

		profile_buttons holds information about button layout.

		When written, this file lets one write the respective profile

		buttons back to the mouse. The data has to be 19 bytes long.

		The mouse will reject invalid data.
@@ -80,7 +80,7 @@ Date: August 2010 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_buttons holds informations about button layout.

		profile_buttons holds information about button layout.

		When read, these files return the respective profile buttons.

		The returned data is 19 bytes in size.

		This file is readonly.