Merge branch 'linus' into x86/memory-corruption-check (a9b9e81c) · Commits · e / devices / android_kernel_fairphone_FP5

.mailmap

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -96,4 +96,6 @@ Tejun Heo <htejun@gmail.com>
	Thomas Graf <tgraf@suug.ch>		Thomas Graf <tgraf@suug.ch>
	Tony Luck <tony.luck@intel.com>		Tony Luck <tony.luck@intel.com>
	Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.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>		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -251,8 +251,6 @@ mono.txt
	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.		- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
	moxa-smartio		moxa-smartio
	- file with info on installing/using Moxa multiport serial driver.		- file with info on installing/using Moxa multiport serial driver.
	mtrr.txt
	- how to use PPro Memory Type Range Registers to increase performance.
	mutex-design.txt		mutex-design.txt
	- info on the generic mutex subsystem.		- info on the generic mutex subsystem.
	namespaces/		namespaces/

0 → 100644

+26 −0

Original line number	Original line	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)

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -337,7 +337,7 @@ With scatterlists, you use the resulting mapping like this:
	int i, count = dma_map_sg(dev, sglist, nents, direction);		int i, count = dma_map_sg(dev, sglist, nents, direction);
	struct scatterlist *sg;		struct scatterlist *sg;

	for (i = 0, sg = sglist; i < count; i++, sg++) {		for_each_sg(sglist, sg, count, i) {
	hw_address[i] = sg_dma_address(sg);		hw_address[i] = sg_dma_address(sg);
	hw_len[i] = sg_dma_len(sg);		hw_len[i] = sg_dma_len(sg);
	}		}

+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