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

Commit 959d851c authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged 



cgroup/for-3.5 contains the following changes which blk-cgroup needs
to proceed with the on-going cleanup.

* Dynamic addition and removal of cftypes to make config/stat file
  handling modular for policies.

* cgroup removal update to not wait for css references to drain to fix
  blkcg removal hang caused by cfq caching cfqgs.

Pull in cgroup/for-3.5 into block/for-3.5/core.  This causes the
following conflicts in block/blk-cgroup.c.

* 761b3ef5 "cgroup: remove cgroup_subsys argument from callbacks"
  conflicts with blkiocg_pre_destroy() addition and blkiocg_attach()
  removal.  Resolved by removing @subsys from all subsys methods.

* 676f7c8f "cgroup: relocate cftype and cgroup_subsys definitions in
  controllers" conflicts with ->pre_destroy() and ->attach() updates
  and removal of modular config.  Resolved by dropping forward
  declarations of the methods and applying updates to the relocated
  blkio_subsys.

* 4baf6e33 "cgroup: convert all non-memcg controllers to the new
  cftype interface" builds upon the previous item.  Resolved by adding
  ->base_cftypes to the relocated blkio_subsys.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents a5567932 48ddbe19

Documentation/00-INDEX

+4 −2
Original line number Original line Diff line number Diff line
@@ -7,8 +7,8 @@ Please try and keep the descriptions small enough to fit on one line. 




Following translations are available on the WWW:

Following translations are available on the WWW:





   - Japanese, maintained by the JF Project (JF@linux.or.jp), at

   - Japanese, maintained by the JF Project (jf@listserv.linux.or.jp), at

     http://www.linux.or.jp/JF/

     http://linuxjf.sourceforge.jp/





00-INDEX

00-INDEX

	- this file.

	- this file.
@@ -104,6 +104,8 @@ cpuidle/ 
	- info on CPU_IDLE, CPU idle state management subsystem.

	- info on CPU_IDLE, CPU idle state management subsystem.

cputopology.txt

cputopology.txt

	- documentation on how CPU topology info is exported via sysfs.

	- documentation on how CPU topology info is exported via sysfs.

crc32.txt

	- brief tutorial on CRC computation

cris/

cris/

	- directory with info about Linux on CRIS architecture.

	- directory with info about Linux on CRIS architecture.

crypto/

crypto/

Documentation/ABI/obsolete/sysfs-class-rfkill

+1 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ Date: 09-Jul-2007 
KernelVersion	v2.6.22

KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Contact:	linux-wireless@vger.kernel.org

Description: 	Current state of the transmitter.

Description: 	Current state of the transmitter.

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

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

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

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

		state of the rfkill driver.

		state of the rfkill driver.

Values: 	A numeric value.

Values: 	A numeric value.

Documentation/ABI/removed/devfs

+1 −1
Original line number Original line Diff line number Diff line 
What:		devfs

What:		devfs

Date:		July 2005 (scheduled), finally removed in kernel v2.6.18

Date:		July 2005 (scheduled), finally removed in kernel v2.6.18

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

Description:

	devfs has been unmaintained for a number of years, has unfixable

	devfs has been unmaintained for a number of years, has unfixable

	races, contains a naming policy within the kernel that is

	races, contains a naming policy within the kernel that is

Documentation/ABI/stable/sysfs-driver-usb-usbtmc

+6 −6
Original line number Original line Diff line number Diff line 
What:		/sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities

Date:		August 2008

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

Description:

		These files show the various USB TMC capabilities as described

		These files show the various USB TMC capabilities as described

		by the device itself.  The full description of the bitfields

		by the device itself.  The full description of the bitfields
@@ -15,7 +15,7 @@ Description: 
What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities

Date:		August 2008

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

Description:

		These files show the various USB TMC capabilities as described

		These files show the various USB TMC capabilities as described

		by the device itself.  The full description of the bitfields

		by the device itself.  The full description of the bitfields
@@ -29,7 +29,7 @@ Description: 




What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermChar

What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermChar

Date:		August 2008

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

Description:

		This file is the TermChar value to be sent to the USB TMC

		This file is the TermChar value to be sent to the USB TMC

		device as described by the document, "Universal Serial Bus Test

		device as described by the document, "Universal Serial Bus Test
@@ -42,7 +42,7 @@ Description: 




What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled

What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled

Date:		August 2008

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

Description:

		This file determines if the TermChar is to be sent to the

		This file determines if the TermChar is to be sent to the

		device on every transaction or not.  For more details about

		device on every transaction or not.  For more details about
@@ -53,9 +53,9 @@ Description: 




What:		/sys/bus/usb/drivers/usbtmc/devices/*/auto_abort

What:		/sys/bus/usb/drivers/usbtmc/devices/*/auto_abort

Date:		August 2008

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

Description:

		This file determines if the the transaction of the USB TMC

		This file determines if the transaction of the USB TMC

		device is to be automatically aborted if there is any error.

		device is to be automatically aborted if there is any error.

		For more details about this, please see the document,

		For more details about this, please see the document,

		"Universal Serial Bus Test and Measurement Class Specification

		"Universal Serial Bus Test and Measurement Class Specification

Documentation/ABI/stable/sysfs-module

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ Description: 
		The name of the module that is in the kernel.  This

		The name of the module that is in the kernel.  This

		module name will show up either if the module is built

		module name will show up either if the module is built

		directly into the kernel, or if it is loaded as a

		directly into the kernel, or if it is loaded as a

		dyanmic module.

		dynamic module.





	/sys/module/MODULENAME/parameters

	/sys/module/MODULENAME/parameters

		This directory contains individual files that are each

		This directory contains individual files that are each