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

Commit 0d629501 authored by Haavard Skinnemoen's avatar Haavard Skinnemoen
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28

parents b3bc2c55 5e7184ae

Documentation/DMA-mapping.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -740,7 +740,7 @@ failure can be determined by: 
	dma_addr_t dma_handle;

	dma_addr_t dma_handle;





	dma_handle = pci_map_single(pdev, addr, size, direction);

	dma_handle = pci_map_single(pdev, addr, size, direction);

	if (pci_dma_mapping_error(dma_handle)) {

	if (pci_dma_mapping_error(pdev, dma_handle)) {

		/*

		/*

		 * reduce current DMA mapping usage,

		 * reduce current DMA mapping usage,

		 * delay and try again later or

		 * delay and try again later or

Documentation/HOWTO

+2 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,8 @@ documentation files are also added which explain how to use the feature. 
When a kernel change causes the interface that the kernel exposes to

When a kernel change causes the interface that the kernel exposes to

userspace to change, it is recommended that you send the information or

userspace to change, it is recommended that you send the information or

a patch to the manual pages explaining the change to the manual pages

a patch to the manual pages explaining the change to the manual pages

maintainer at mtk.manpages@gmail.com.

maintainer at mtk.manpages@gmail.com, and CC the list

linux-api@vger.kernel.org.





Here is a list of files that are in the kernel source tree that are

Here is a list of files that are in the kernel source tree that are

required reading:

required reading:

Documentation/SubmitChecklist

+2 −0
Original line number Original line Diff line number Diff line
@@ -67,6 +67,8 @@ kernel patches. 




19: All new userspace interfaces are documented in Documentation/ABI/.

19: All new userspace interfaces are documented in Documentation/ABI/.

    See Documentation/ABI/README for more information.

    See Documentation/ABI/README for more information.

    Patches that change userspace interfaces should be CCed to

    linux-api@vger.kernel.org.





20: Check that it all passes `make headers_check'.

20: Check that it all passes `make headers_check'.

Documentation/ioctl/cdrom.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -271,14 +271,14 @@ CDROMCLOSETRAY pendant of CDROMEJECT 




	usage:

	usage:





	  ioctl(fd, CDROMEJECT, 0);

	  ioctl(fd, CDROMCLOSETRAY, 0);





	inputs:		none

	inputs:		none





	outputs:	none

	outputs:	none





	error returns:

	error returns:

	  ENOSYS	cd drive not capable of ejecting

	  ENOSYS	cd drive not capable of closing the tray

	  EBUSY		other processes are accessing drive, or door is locked

	  EBUSY		other processes are accessing drive, or door is locked





	notes:

	notes:

Documentation/sysctl/kernel.txt

+4 −3
Original line number Original line Diff line number Diff line
@@ -351,9 +351,10 @@ kernel. This value defaults to SHMMAX. 




softlockup_thresh:

softlockup_thresh:





This value can be used to lower the softlockup tolerance

This value can be used to lower the softlockup tolerance threshold.  The

threshold. The default threshold is 10s.  If a cpu is locked up

default threshold is 60 seconds.  If a cpu is locked up for 60 seconds,

for 10s, the kernel complains.  Valid values are 1-60s.

the kernel complains.  Valid values are 1-60 seconds.  Setting this

tunable to zero will disable the softlockup detection altogether.





==============================================================

==============================================================