Merge branch 'linus' into core/softlockup (871cafcc) · Commits · e / devices / android_kernel_sony_msm8998

.mailmap

+3 −1

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ Rudolf Marek <R.Marek@sh.cvut.cz>
		Rui Saraiva <rmps@joel.ist.utl.pt>
		Sachin P Sant <ssant@in.ibm.com>
		Sam Ravnborg <sam@mars.ravnborg.org>
		Sascha Hauer <s.hauer@pengutronix.de>
		S.Çağlar Onur <caglar@pardus.org.tr>
		Simon Kelley <simon@thekelleys.org.uk>
		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
		@@ -100,6 +101,7 @@ 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>
		Uwe Kleine-König <ukl@pengutronix.de>
		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

+4 −7

Original line number	Diff line number	Diff line
		@@ -3786,14 +3786,11 @@ S: The Netherlands

		N: David Woodhouse
		E: dwmw2@infradead.org
		D: ARCnet stuff, Applicom board driver, SO_BINDTODEVICE,
		D: some Alpha platform porting from 2.0, Memory Technology Devices,
		D: Acquire watchdog timer, PC speaker driver maintenance,
		D: JFFS2 file system, Memory Technology Device subsystem,
		D: various other stuff that annoyed me by not working.
		S: c/o Red Hat Engineering
		S: Rustat House
		S: 60 Clifton Road
		S: Cambridge. CB1 7EG
		S: c/o Intel Corporation
		S: Pipers Way
		S: Swindon. SN3 1RJ
		S: England

		N: Chris Wright

+3 −1

Original line number	Diff line number	Diff line
		@@ -33,10 +33,12 @@ o Gnu make 3.79.1 # make --version
		o binutils 2.12 # ld -v
		o util-linux 2.10o # fdformat --version
		o module-init-tools 0.9.10 # depmod -V
		o e2fsprogs 1.29 # tune2fs
		o e2fsprogs 1.41.4 # e2fsck -V
		o jfsutils 1.1.3 # fsck.jfs -V
		o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1\|grep reiserfsprogs
		o xfsprogs 2.6.0 # xfs_db -V
		o squashfs-tools 4.0 # mksquashfs -version
		o btrfs-progs 0.18 # btrfsck
		o pcmciautils 004 # pccardctl -V
		o quota-tools 3.09 # quota -V
		o PPP 2.4.0 # pppd --version

+13 −5

Original line number	Diff line number	Diff line
		@@ -483,17 +483,25 @@ values. To do the latter, you can stick the following in your .emacs file:
		(* (max steps 1)
		c-basic-offset)))

		(add-hook 'c-mode-common-hook
		(lambda ()
		;; Add kernel style
		(c-add-style
		"linux-tabs-only"
		'("linux" (c-offsets-alist
		(arglist-cont-nonempty
		c-lineup-gcc-asm-reg
		c-lineup-arglist-tabs-only))))))

		(add-hook 'c-mode-hook
		(lambda ()
		(let ((filename (buffer-file-name)))
		;; Enable kernel mode for the appropriate files
		(when (and filename
		(string-match "~/src/linux-trees" filename))
		(string-match (expand-file-name "~/src/linux-trees")
		filename))
		(setq indent-tabs-mode t)
		(c-set-style "linux")
		(c-set-offset 'arglist-cont-nonempty
		'(c-lineup-gcc-asm-reg
		c-lineup-arglist-tabs-only))))))
		(c-set-style "linux-tabs-only")))))

		This will make emacs go better with the kernel coding style for C
		files below ~/src/linux-trees.

+5 −6

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@

		This document describes the DMA API. For a more gentle introduction
		phrased in terms of the pci_ equivalents (and actual examples) see
		DMA-mapping.txt
		Documentation/PCI/PCI-DMA-mapping.txt.

		This API is split into two pieces. Part I describes the API and the
		corresponding pci_ API. Part II describes the extensions to the API
		@@ -170,16 +170,15 @@ Returns: 0 if successful and a negative error if not.
		u64
		dma_get_required_mask(struct device *dev)

		After setting the mask with dma_set_mask(), this API returns the
		actual mask (within that already set) that the platform actually
		requires to operate efficiently. Usually this means the returned mask
		This API returns the mask that the platform requires to
		operate efficiently. Usually this means the returned mask
		is the minimum required to cover all of memory. Examining the
		required mask gives drivers with variable descriptor sizes the
		opportunity to use smaller descriptors as necessary.

		Requesting the required mask does not alter the current mask. If you
		wish to take advantage of it, you should issue another dma_set_mask()
		call to lower the mask again.
		wish to take advantage of it, you should issue a dma_set_mask()
		call to set the mask to the value returned.


		Part Id - Streaming DMA mappings