Commit fc76a258 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-3.11-rc1' of... 

Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core updates from Greg KH:
 "Here's the big driver core merge for 3.11-rc1

  Lots of little things, and larger firmware subsystem updates, all
  described in the shortlog.  Nice thing here is that we finally get rid
  of CONFIG_HOTPLUG, after 10+ years, thanks to Stephen Rohtwell (it had
  been always on for a number of kernel releases, now it's just
  removed)"

* tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (27 commits)
  driver core: device.h: fix doc compilation warnings
  firmware loader: fix another compile warning with PM_SLEEP unset
  build some drivers only when compile-testing
  firmware loader: fix compile warning with PM_SLEEP set
  kobject: sanitize argument for format string
  sysfs_notify is only possible on file attributes
  firmware loader: simplify holding module for request_firmware
  firmware loader: don't export cache_firmware and uncache_firmware
  drivers/base: Use attribute groups to create sysfs memory files
  firmware loader: fix compile warning
  firmware loader: fix build failure with !CONFIG_FW_LOADER_USER_HELPER
  Documentation: Updated broken link in HOWTO
  Finally eradicate CONFIG_HOTPLUG
  driver core: firmware loader: kill FW_ACTION_NOHOTPLUG requests before suspend
  driver core: firmware loader: don't cache FW_ACTION_NOHOTPLUG firmware
  Documentation: Tidy up some drivers/base/core.c kerneldoc content.
  platform_device: use a macro instead of platform_driver_register
  firmware: move EXPORT_SYMBOL annotations
  firmware: Avoid deadlock of usermodehelper lock at shutdown
  dell_rbu: Select CONFIG_FW_LOADER_USER_HELPER explicitly
  ...
parents fe3c22bd bfd63cd2

Documentation/ABI/testing/sysfs-bus-pci

+1 −4
Original line number Original line Diff line number Diff line
@@ -64,7 +64,6 @@ Description: 
		Writing a non-zero value to this attribute will

		Writing a non-zero value to this attribute will

		force a rescan of all PCI buses in the system, and

		force a rescan of all PCI buses in the system, and

		re-discover previously removed devices.

		re-discover previously removed devices.

		Depends on CONFIG_HOTPLUG.





What:		/sys/bus/pci/devices/.../msi_irqs/

What:		/sys/bus/pci/devices/.../msi_irqs/

Date:		September, 2011

Date:		September, 2011
@@ -90,7 +89,6 @@ Contact: Linux PCI developers <linux-pci@vger.kernel.org> 
Description:

Description:

		Writing a non-zero value to this attribute will

		Writing a non-zero value to this attribute will

		hot-remove the PCI device and any of its children.

		hot-remove the PCI device and any of its children.

		Depends on CONFIG_HOTPLUG.





What:		/sys/bus/pci/devices/.../pci_bus/.../rescan

What:		/sys/bus/pci/devices/.../pci_bus/.../rescan

Date:		May 2011

Date:		May 2011
@@ -99,7 +97,7 @@ Description: 
		Writing a non-zero value to this attribute will

		Writing a non-zero value to this attribute will

		force a rescan of the bus and all child buses,

		force a rescan of the bus and all child buses,

		and re-discover devices removed earlier from this

		and re-discover devices removed earlier from this

		part of the device tree.  Depends on CONFIG_HOTPLUG.

		part of the device tree.





What:		/sys/bus/pci/devices/.../rescan

What:		/sys/bus/pci/devices/.../rescan

Date:		January 2009

Date:		January 2009
@@ -109,7 +107,6 @@ Description: 
		force a rescan of the device's parent bus and all

		force a rescan of the device's parent bus and all

		child buses, and re-discover devices removed earlier

		child buses, and re-discover devices removed earlier

		from this part of the device tree.

		from this part of the device tree.

		Depends on CONFIG_HOTPLUG.





What:		/sys/bus/pci/devices/.../reset

What:		/sys/bus/pci/devices/.../reset

Date:		July 2009

Date:		July 2009

Documentation/HOWTO

+1 −1
Original line number Original line Diff line number Diff line
@@ -112,7 +112,7 @@ required reading: 




    Other excellent descriptions of how to create patches properly are:

    Other excellent descriptions of how to create patches properly are:

	"The Perfect Patch"

	"The Perfect Patch"

		http://userweb.kernel.org/~akpm/stuff/tpp.txt

		http://kerneltrap.org/node/3737

	"Linux kernel patch submission format"

	"Linux kernel patch submission format"

		http://linux.yyz.us/patch-format.html

		http://linux.yyz.us/patch-format.html

Documentation/SubmitChecklist

+1 −1
Original line number Original line Diff line number Diff line
@@ -105,5 +105,5 @@ kernel patches. 
    same time, just various/random combinations of them]:

    same time, just various/random combinations of them]:





    CONFIG_SMP, CONFIG_SYSFS, CONFIG_PROC_FS, CONFIG_INPUT, CONFIG_PCI,

    CONFIG_SMP, CONFIG_SYSFS, CONFIG_PROC_FS, CONFIG_INPUT, CONFIG_PCI,

    CONFIG_BLOCK, CONFIG_PM, CONFIG_HOTPLUG, CONFIG_MAGIC_SYSRQ,

    CONFIG_BLOCK, CONFIG_PM, CONFIG_MAGIC_SYSRQ,

    CONFIG_NET, CONFIG_INET=n (but latter with CONFIG_NET=y)
 
    CONFIG_NET, CONFIG_INET=n (but latter with CONFIG_NET=y)

Documentation/cpu-hotplug.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -128,7 +128,7 @@ A: When doing make defconfig, Enable CPU hotplug support 




   "Processor type and Features" -> Support for Hotpluggable CPUs

   "Processor type and Features" -> Support for Hotpluggable CPUs





Make sure that you have CONFIG_HOTPLUG, and CONFIG_SMP turned on as well.

Make sure that you have CONFIG_SMP turned on as well.





You would need to enable CONFIG_HOTPLUG_CPU for SMP suspend/resume support

You would need to enable CONFIG_HOTPLUG_CPU for SMP suspend/resume support

as well.

as well.

Documentation/hwmon/submitting-patches

+1 −2
Original line number Original line Diff line number Diff line
@@ -27,8 +27,7 @@ increase the chances of your change being accepted. 
  explicitly below the patch header.

  explicitly below the patch header.





* If your patch (or the driver) is affected by configuration options such as

* If your patch (or the driver) is affected by configuration options such as

  CONFIG_SMP or CONFIG_HOTPLUG, make sure it compiles for all configuration

  CONFIG_SMP, make sure it compiles for all configuration variants.

  variants.









2. Adding functionality to existing drivers

2. Adding functionality to existing drivers

CRA Git | Maintained and supported by SUSTech CRA and CCSE