Merge branch 'linus' into timers/urgent, to pick up fixes (fdbdfefb) · Commits · e / devices / android_kernel_fairphone_FP4

.cocciconfig

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		[spatch]
		options = --timeout 200
		options = --use-gitgrep

.gitignore

+2 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ modules.builtin
		Module.symvers
		*.dwo
		*.su
		.c.[012].*

		#
		# Top-level generic files
		@@ -66,6 +67,7 @@ Module.symvers
		#
		!.gitignore
		!.mailmap
		!.cocciconfig

		#
		# Generated include files

.mailmap

+13 −2

Original line number	Diff line number	Diff line
		@@ -92,9 +92,17 @@ Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
		Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
		Leonid I Ananiev <leonid.i.ananiev@intel.com>
		Linas Vepstas <linas@austin.ibm.com>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
		Mark Brown <broonie@sirena.org.uk>
		Matthieu CASTET <castet.matthieu@free.fr>
		Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com>
		Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>
		Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
		Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org>
		Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
		Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
		Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
		Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
		Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
		Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
		Mayuresh Janorkar <mayur@ti.com>
		@@ -130,7 +138,10 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org>
		Sascha Hauer <s.hauer@pengutronix.de>
		S.Çağlar Onur <caglar@pardus.org.tr>
		Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
		Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> <shuah.khan@hp.com> <shuahkh@osg.samsung.com> <shuah.kh@samsung.com>
		Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
		Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
		Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
		Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
		Simon Kelley <simon@thekelleys.org.uk>
		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
		Stephen Hemminger <shemminger@osdl.org>

Documentation/ABI/testing/sysfs-class-pwm

+9 −0

Original line number	Diff line number	Diff line
		@@ -77,3 +77,12 @@ Description:
		Enable/disable the PWM signal.
		0 is disabled
		1 is enabled

		What: /sys/class/pwm/pwmchipN/pwmX/capture
		Date: June 2016
		KernelVersion: 4.8
		Contact: Lee Jones <lee.jones@linaro.org>
		Description:
		Capture information about a PWM signal. The output format is a
		pair unsigned integers (period and duty cycle), separated by a
		single space.

Documentation/DMA-API.txt

+14 −19

Original line number	Diff line number	Diff line
		@@ -369,35 +369,32 @@ See also dma_map_single().
		dma_addr_t
		dma_map_single_attrs(struct device dev, void cpu_addr, size_t size,
		enum dma_data_direction dir,
		struct dma_attrs *attrs)
		unsigned long attrs)

		void
		dma_unmap_single_attrs(struct device *dev, dma_addr_t dma_addr,
		size_t size, enum dma_data_direction dir,
		struct dma_attrs *attrs)
		unsigned long attrs)

		int
		dma_map_sg_attrs(struct device dev, struct scatterlist sgl,
		int nents, enum dma_data_direction dir,
		struct dma_attrs *attrs)
		unsigned long attrs)

		void
		dma_unmap_sg_attrs(struct device dev, struct scatterlist sgl,
		int nents, enum dma_data_direction dir,
		struct dma_attrs *attrs)
		unsigned long attrs)

		The four functions above are just like the counterpart functions
		without the _attrs suffixes, except that they pass an optional
		struct dma_attrs*.

		struct dma_attrs encapsulates a set of "DMA attributes". For the
		definition of struct dma_attrs see linux/dma-attrs.h.
		dma_attrs.

		The interpretation of DMA attributes is architecture-specific, and
		each attribute should be documented in Documentation/DMA-attributes.txt.

		If struct dma_attrs* is NULL, the semantics of each of these
		functions is identical to those of the corresponding function
		If dma_attrs are 0, the semantics of each of these functions
		is identical to those of the corresponding function
		without the _attrs suffix. As a result dma_map_single_attrs()
		can generally replace dma_map_single(), etc.

		@@ -405,15 +402,15 @@ As an example of the use of the *_attrs functions, here's how
		you could pass an attribute DMA_ATTR_FOO when mapping memory
		for DMA:

		#include <linux/dma-attrs.h>
		/* DMA_ATTR_FOO should be defined in linux/dma-attrs.h and
		#include <linux/dma-mapping.h>
		/* DMA_ATTR_FOO should be defined in linux/dma-mapping.h and
		* documented in Documentation/DMA-attributes.txt */
		...

		DEFINE_DMA_ATTRS(attrs);
		dma_set_attr(DMA_ATTR_FOO, &attrs);
		unsigned long attr;
		attr \|= DMA_ATTR_FOO;
		....
		n = dma_map_sg_attrs(dev, sg, nents, DMA_TO_DEVICE, &attr);
		n = dma_map_sg_attrs(dev, sg, nents, DMA_TO_DEVICE, attr);
		....

		Architectures that care about DMA_ATTR_FOO would check for its
		@@ -422,12 +419,10 @@ routines, e.g.:

		void whizco_dma_map_sg_attrs(struct device *dev, dma_addr_t dma_addr,
		size_t size, enum dma_data_direction dir,
		struct dma_attrs *attrs)
		unsigned long attrs)
		{
		....
		int foo = dma_get_attr(DMA_ATTR_FOO, attrs);
		....
		if (foo)
		if (attrs & DMA_ATTR_FOO)
		/* twizzle the frobnozzle */
		....