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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
  vlynq: make whole Kconfig-menu dependant on architecture
  add descriptive comment for TIF_MEMDIE task flag declaration.
  EEPROM: max6875: Header file cleanup
  EEPROM: 93cx6: Header file cleanup
  EEPROM: Header file cleanup
  agp: use NULL instead of 0 when pointer is needed
  rtc-v3020: make bitfield unsigned
  PCI: make bitfield unsigned
  jbd2: use NULL instead of 0 when pointer is needed
  cciss: fix shadows sparse warning
  doc: inode uses a mutex instead of a semaphore.
  uml: i386: Avoid redefinition of NR_syscalls
  fix "seperate" typos in comments
  cocbalt_lcdfb: correct sections
  doc: Change urls for sparse
  Powerpc: wii: Fix typo in comment
  i2o: cleanup some exit paths
  Documentation/: it's -> its where appropriate
  UML: Fix compiler warning due to missing task_struct declaration
  UML: add kernel.h include to signal.c
  ...
parents 54291263 7db82437

Documentation/ABI/testing/sysfs-devices-memory

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 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

		is read-write.  When read, its 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)

Documentation/DMA-API-HOWTO.txt

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ failure can be determined by: 


			   Closing



This document, and the API itself, would not be in it's current

This document, and the API itself, would not be in its current

form without the feedback and suggestions from numerous individuals.

We would like to specifically mention, in no particular order, the

following people:

Documentation/DocBook/libata.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ void (*host_stop) (struct ata_host_set *host_set); 
	allocates space for a legacy IDE PRD table and returns.

	</para>

	<para>

	->port_stop() is called after ->host_stop().  It's sole function

	->port_stop() is called after ->host_stop().  Its sole function

	is to release DMA/memory resources, now that they are no longer

	actively being used.  Many drivers also free driver-private

	data from port at this time.

Documentation/PCI/pci-error-recovery.txt

+2 −2
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ The driver should return one of the following result codes: 


		- PCI_ERS_RESULT_NEED_RESET

		  Driver returns this if it thinks the device is not

		  recoverable in it's current state and it needs a slot

		  recoverable in its current state and it needs a slot

		  reset to proceed.



		- PCI_ERS_RESULT_DISCONNECT
@@ -241,7 +241,7 @@ in working condition. 


The driver is not supposed to restart normal driver I/O operations

at this point.  It should limit itself to "probing" the device to

check it's recoverability status. If all is right, then the platform

check its recoverability status. If all is right, then the platform

will call resume() once all drivers have ack'd link_reset().



	Result codes:

Documentation/Smack.txt

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ NOTE: Smack labels are limited to 23 characters. The attr command 
If you don't do anything special all users will get the floor ("_")

label when they log in. If you do want to log in via the hacked ssh

at other labels use the attr command to set the smack value on the

home directory and it's contents.

home directory and its contents.



You can add access rules in /etc/smack/accesses. They take the form: