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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 48433419 184ca823

.mailmap

+11 −2
Original line number Diff line number Diff line
@@ -96,7 +96,13 @@ 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>
@@ -132,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 */

	....

Documentation/DMA-attributes.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
			==============



This document describes the semantics of the DMA attributes that are

defined in linux/dma-attrs.h.

defined in linux/dma-mapping.h.



DMA_ATTR_WRITE_BARRIER

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

Documentation/DocBook/Makefile

+11 −20
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 
# To add a new book the only step required is to add the book to the

# list of DOCBOOKS.



ifeq ($(IGNORE_DOCBOOKS),)



DOCBOOKS := z8530book.xml device-drivers.xml \

	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \

	    writing_usb_driver.xml networking.xml \
@@ -16,10 +14,16 @@ DOCBOOKS := z8530book.xml device-drivers.xml \ 
	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    80211.xml debugobjects.xml sh.xml regulator.xml \

	    alsa-driver-api.xml writing-an-alsa-driver.xml \

	    tracepoint.xml media_api.xml w1.xml \

	    tracepoint.xml w1.xml \

	    writing_musb_glue_layer.xml crypto-API.xml iio.xml



include Documentation/DocBook/media/Makefile

ifeq ($(DOCBOOKS),)



# Skip DocBook build if the user explicitly requested no DOCBOOKS.

.DEFAULT:

	@echo "  SKIP    DocBook $@ target (DOCBOOKS=\"\" specified)."



else



###

# The build process is as follows (targets):
@@ -49,7 +53,6 @@ pdfdocs: $(PDF) 
HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))

htmldocs: $(HTML)

	$(call cmd,build_main_index)

	$(call install_media_images)



MAN := $(patsubst %.xml, %.9, $(BOOKS))

mandocs: $(MAN)
@@ -217,19 +220,7 @@ silent_gen_xml = : 
	       -e "s/>/\\&gt;/g";     \

	   echo "</programlisting>")  > $@



else



# Needed, due to cleanmediadocs

include Documentation/DocBook/media/Makefile



htmldocs:

pdfdocs:

psdocs:

xmldocs:

installmandocs:



endif # IGNORE_DOCBOOKS



endif # DOCBOOKS=""



###

# Help targets as used by the top-level makefile
@@ -246,7 +237,7 @@ dochelp: 
	@echo  '  make DOCBOOKS="s1.xml s2.xml" [target] Generate only docs s1.xml s2.xml'

	@echo  '  valid values for DOCBOOKS are: $(DOCBOOKS)'

	@echo

	@echo  "  make IGNORE_DOCBOOKS=1 [target] Don't generate docs from Docbook"

	@echo  "  make DOCBOOKS=\"\" [target] Don't generate docs from Docbook"

	@echo  '     This is useful to generate only the ReST docs (Sphinx)'
@@ -269,7 +260,7 @@ clean-files := $(DOCBOOKS) \ 


clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man



cleandocs: cleanmediadocs

cleandocs:

	$(Q)rm -f $(call objectify, $(clean-files))

	$(Q)rm -rf $(call objectify, $(clean-dirs))