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

Commit aa2ba5f1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	drivers/net/smc91x.c
parents 68024541 f6f7b52e

Documentation/DMA-API.txt

+3 −5
Original line number Diff line number Diff line
@@ -316,12 +316,10 @@ reduce current DMA mapping usage or delay and try again later). 
	pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg,

		int nents, int direction)



Maps a scatter gather list from the block layer.



Returns: the number of physical segments mapped (this may be shorter

than <nents> passed in if the block layer determines that some

elements of the scatter/gather list are physically adjacent and thus

may be mapped with a single entry).

than <nents> passed in if some elements of the scatter/gather list are

physically or virtually adjacent and an IOMMU maps them with a single

entry).



Please note that the sg cannot be mapped again if it has been mapped once.

The mapping process is allowed to destroy information in the sg.

Documentation/cpu-freq/user-guide.txt

+12 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Contents: 
1.3 sparc64

1.4 ppc

1.5 SuperH

1.6 Blackfin



2. "Policy" / "Governor"?

2.1 Policy
@@ -97,6 +98,17 @@ The following SuperH processors are supported by cpufreq: 
SH-3

SH-4



1.6 Blackfin

------------



The following Blackfin processors are supported by cpufreq:



BF522, BF523, BF524, BF525, BF526, BF527, Rev 0.1 or higher

BF531, BF532, BF533, Rev 0.3 or higher

BF534, BF536, BF537, Rev 0.2 or higher

BF561, Rev 0.3 or higher

BF542, BF544, BF547, BF548, BF549, Rev 0.1 or higher





2. "Policy" / "Governor" ?

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

Documentation/filesystems/ocfs2.txt

+0 −3
Original line number Diff line number Diff line
@@ -28,10 +28,7 @@ Manish Singh <manish.singh@oracle.com> 
Caveats

=======

Features which OCFS2 does not support yet:

	- extended attributes

	- quotas

	- cluster aware flock

	- cluster aware lockf

	- Directory change notification (F_NOTIFY)

	- Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)

	- POSIX ACLs

Documentation/filesystems/proc.txt

+27 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ Table of Contents 
  2.14	/proc/<pid>/io - Display the IO accounting fields

  2.15	/proc/<pid>/coredump_filter - Core dump filtering settings

  2.16	/proc/<pid>/mountinfo - Information about mounts

  2.17	/proc/sys/fs/epoll - Configuration options for the epoll interface



------------------------------------------------------------------------------

Preface
@@ -2483,4 +2484,30 @@ For more information on mount propagation see: 


  Documentation/filesystems/sharedsubtree.txt



2.17	/proc/sys/fs/epoll - Configuration options for the epoll interface

--------------------------------------------------------



This directory contains configuration options for the epoll(7) interface.



max_user_instances

------------------



This is the maximum number of epoll file descriptors that a single user can

have open at a given time. The default value is 128, and should be enough

for normal users.



max_user_watches

----------------



Every epoll file descriptor can store a number of files to be monitored

for event readiness. Each one of these monitored files constitutes a "watch".

This configuration option sets the maximum number of "watches" that are

allowed for each user.

Each "watch" costs roughly 90 bytes on a 32bit kernel, and roughly 160 bytes

on a 64bit one.

The current default value for  max_user_watches  is the 1/32 of the available

low memory, divided for the "watch" cost in bytes.





------------------------------------------------------------------------------

Documentation/filesystems/ramfs-rootfs-initramfs.txt

+6 −6
Original line number Diff line number Diff line
@@ -130,12 +130,12 @@ The 2.6 kernel build process always creates a gzipped cpio format initramfs 
archive and links it into the resulting kernel binary.  By default, this

archive is empty (consuming 134 bytes on x86).



The config option CONFIG_INITRAMFS_SOURCE (for some reason buried under

devices->block devices in menuconfig, and living in usr/Kconfig) can be used

to specify a source for the initramfs archive, which will automatically be

incorporated into the resulting binary.  This option can point to an existing

gzipped cpio archive, a directory containing files to be archived, or a text

file specification such as the following example:

The config option CONFIG_INITRAMFS_SOURCE (in General Setup in menuconfig,

and living in usr/Kconfig) can be used to specify a source for the

initramfs archive, which will automatically be incorporated into the

resulting binary.  This option can point to an existing gzipped cpio

archive, a directory containing files to be archived, or a text file

specification such as the following example:



  dir /dev 755 0 0

  nod /dev/console 644 0 0 c 5 1