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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: (36 commits)
  SCSI: convert struct class_device to struct device
  DRM: remove unused dev_class
  IB: rename "dev" to "srp_dev" in srp_host structure
  IB: convert struct class_device to struct device
  memstick: convert struct class_device to struct device
  driver core: replace remaining __FUNCTION__ occurrences
  sysfs: refill attribute buffer when reading from offset 0
  PM: Remove destroy_suspended_device()
  Firmware: add iSCSI iBFT Support
  PM: Remove legacy PM (fix)
  Kobject: Replace list_for_each() with list_for_each_entry().
  SYSFS: Explicitly include required header file slab.h.
  Driver core: make device_is_registered() work for class devices
  PM: Convert wakeup flag accessors to inline functions
  PM: Make wakeup flags available whenever CONFIG_PM is set
  PM: Fix misuse of wakeup flag accessors in serial core
  Driver core: Call device_pm_add() after bus_add_device() in device_add()
  PM: Handle device registrations during suspend/resume
  block: send disk "change" event for rescan_partitions()
  sysdev: detect multiple driver registrations
  ...

Fixed trivial conflict in include/linux/memory.h due to semaphore header
file change (made irrelevant by the change to mutex).
parents 529a41e3 ee959b00

Documentation/ABI/testing/sysfs-ibft

0 → 100644
+23 −0
Original line number Diff line number Diff line 
What:		/sys/firmware/ibft/initiator

Date:		November 2007

Contact:	Konrad Rzeszutek <ketuzsezr@darnok.org>

Description:	The /sys/firmware/ibft/initiator directory will contain

		files that expose the iSCSI Boot Firmware Table initiator data.

		Usually this contains the Initiator name.



What:		/sys/firmware/ibft/targetX

Date:		November 2007

Contact:	Konrad Rzeszutek <ketuzsezr@darnok.org>

Description:	The /sys/firmware/ibft/targetX directory will contain

		files that expose the iSCSI Boot Firmware Table target data.

		Usually this contains the target's IP address, boot LUN,

		target name, and what NIC it is associated with. It can also

		contain the CHAP name (and password), the reverse CHAP

		name (and password)



What:		/sys/firmware/ibft/ethernetX

Date:		November 2007

Contact:	Konrad Rzeszutek <ketuzsezr@darnok.org>

Description:	The /sys/firmware/ibft/ethernetX directory will contain

		files that expose the iSCSI Boot Firmware Table NIC data.

		This can this can the IP address, MAC, and gateway of the NIC.

Documentation/DocBook/kernel-api.tmpl

+0 −5
Original line number Diff line number Diff line
@@ -297,11 +297,6 @@ X!Earch/x86/kernel/mca_32.c 
!Ikernel/acct.c

  </chapter>



  <chapter id="pmfuncs">

     <title>Power Management</title>

!Ekernel/power/pm.c

  </chapter>



  <chapter id="devdrivers">

     <title>Device drivers infrastructure</title>

     <sect1><title>Device Drivers Base</title>

Documentation/filesystems/sysfs.txt

+7 −2
Original line number Diff line number Diff line
@@ -176,8 +176,10 @@ implementations: 
  Recall that an attribute should only be exporting one value, or an

  array of similar values, so this shouldn't be that expensive. 



  This allows userspace to do partial reads and seeks arbitrarily over

  the entire file at will. 

  This allows userspace to do partial reads and forward seeks

  arbitrarily over the entire file at will. If userspace seeks back to

  zero or does a pread(2) with an offset of '0' the show() method will

  be called again, rearmed, to fill the buffer.



- On write(2), sysfs expects the entire buffer to be passed during the

  first write. Sysfs then passes the entire buffer to the store()
@@ -192,6 +194,9 @@ implementations: 


Other notes:



- Writing causes the show() method to be rearmed regardless of current

  file position.



- The buffer will always be PAGE_SIZE bytes in length. On i386, this

  is 4096.

Documentation/power/devices.txt

+5 −0
Original line number Diff line number Diff line
@@ -196,6 +196,11 @@ its parent; and can't be removed or suspended after that parent. 


The policy is that the device tree should match hardware bus topology.

(Or at least the control bus, for devices which use multiple busses.)

In particular, this means that a device registration may fail if the parent of

the device is suspending (ie. has been chosen by the PM core as the next

device to suspend) or has already suspended, as well as after all of the other

devices have been suspended.  Device drivers must be prepared to cope with such

situations.





Suspending Devices

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -3610,6 +3610,11 @@ M: mhoffman@lightlink.com 
L:	lm-sensors@lm-sensors.org

S:	Maintained



SMX UIO Interface

P:	Ben Nizette

M:	bn@niasdigital.com

S:	Maintained



SOFTWARE RAID (Multiple Disks) SUPPORT

P:	Ingo Molnar

M:	mingo@redhat.com

CRA Git | Maintained and supported by SUSTech CRA and CCSE