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

Commit b262e603 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/wireless/ath9k/core.c
	drivers/net/wireless/ath9k/main.c
	net/core/dev.c
parents 93c8b90f 05238204

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -96,4 +96,6 @@ Tejun Heo <htejun@gmail.com> 
Thomas Graf <tgraf@suug.ch>

Tony Luck <tony.luck@intel.com>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Documentation/ABI/testing/sysfs-gpio

0 → 100644
+26 −0
Original line number Diff line number Diff line 
What:		/sys/class/gpio/

Date:		July 2008

KernelVersion:	2.6.27

Contact:	David Brownell <dbrownell@users.sourceforge.net>

Description:



  As a Kconfig option, individual GPIO signals may be accessed from

  userspace.  GPIOs are only made available to userspace by an explicit

  "export" operation.  If a given GPIO is not claimed for use by

  kernel code, it may be exported by userspace (and unexported later).

  Kernel code may export it for complete or partial access.



  GPIOs are identified as they are inside the kernel, using integers in

  the range 0..INT_MAX.  See Documentation/gpio.txt for more information.



    /sys/class/gpio

	/export ... asks the kernel to export a GPIO to userspace

	/unexport ... to return a GPIO to the kernel

	/gpioN ... for each exported GPIO #N

	    /value ... always readable, writes fail for input GPIOs

	    /direction ... r/w as: in, out (default low); write: high, low

	/gpiochipN ... for each gpiochip; #N is its first GPIO

	    /base ... (r/o) same as N

	    /label ... (r/o) descriptive, not necessarily unique

	    /ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)

Documentation/DMA-mapping.txt

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



	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,

		 * delay and try again later or

Documentation/cpusets.txt

+10 −8
Original line number Diff line number Diff line
@@ -635,14 +635,16 @@ prior 'mems' setting, will not be moved. 


There is an exception to the above.  If hotplug functionality is used

to remove all the CPUs that are currently assigned to a cpuset,

then the kernel will automatically update the cpus_allowed of all

tasks attached to CPUs in that cpuset to allow all CPUs.  When memory

hotplug functionality for removing Memory Nodes is available, a

similar exception is expected to apply there as well.  In general,

the kernel prefers to violate cpuset placement, over starving a task

that has had all its allowed CPUs or Memory Nodes taken offline.  User

code should reconfigure cpusets to only refer to online CPUs and Memory

Nodes when using hotplug to add or remove such resources.

then all the tasks in that cpuset will be moved to the nearest ancestor

with non-empty cpus.  But the moving of some (or all) tasks might fail if

cpuset is bound with another cgroup subsystem which has some restrictions

on task attaching.  In this failing case, those tasks will stay

in the original cpuset, and the kernel will automatically update

their cpus_allowed to allow all online CPUs.  When memory hotplug

functionality for removing Memory Nodes is available, a similar exception

is expected to apply there as well.  In general, the kernel prefers to

violate cpuset placement, over starving a task that has had all

its allowed CPUs or Memory Nodes taken offline.



There is a second exception to the above.  GFP_ATOMIC requests are

kernel internal allocations that must be satisfied, immediately.

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Diff line number Diff line
@@ -340,3 +340,11 @@ Why: Accounting can now be enabled/disabled without kernel recompilation. 
      controlled by a kernel/module/sysfs/sysctl parameter.

Who:  Krzysztof Piotr Oledzki <ole@ans.pl>



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



What: ide-scsi (BLK_DEV_IDESCSI)

When: 2.6.29

Why:  The 2.6 kernel supports direct writing to ide CD drives, which

      eliminates the need for ide-scsi. The new method is more

      efficient in every way.

Who:  FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>