Merge 4.10-rc4 into usb-next (a47b66da) · Commits · 方亚芬 / raspberrypi_linux

.mailmap

+4 −0

Documentation/ABI/testing/sysfs-devices-deferred_probe

deleted100644 → 0

+0 −12

Original line number	Original line	Diff line number	Diff line
	What: /sys/devices/.../deferred_probe
	Date: August 2016
	Contact: Ben Hutchings <ben.hutchings@codethink.co.uk>
	Description:
	The /sys/devices/.../deferred_probe attribute is
	present for all devices. If a driver detects during
	probing a device that a related device is not yet
	ready, it may defer probing of the first device. The
	kernel will retry probing the first device after any
	other device is successfully probed. This attribute
	reads as 1 if probing of this device is currently
	deferred, or 0 otherwise.

Documentation/devicetree/bindings/i2c/i2c.txt

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -62,6 +62,9 @@ wants to support one of the below features, it should adapt the bindings below.
	"irq" and "wakeup" names are recognized by I2C core, other names are		"irq" and "wakeup" names are recognized by I2C core, other names are
	left to individual drivers.		left to individual drivers.

			- host-notify
			device uses SMBus host notify protocol instead of interrupt line.

	- multi-master		- multi-master
	states that there is another master active on this bus. The OS can use		states that there is another master active on this bus. The OS can use
	this information to adapt power management to keep the arbitration awake		this information to adapt power management to keep the arbitration awake
	@@ -81,6 +84,11 @@ Binding may contain optional "interrupts" property, describing interrupts
	used by the device. I2C core will assign "irq" interrupt (or the very first		used by the device. I2C core will assign "irq" interrupt (or the very first
	interrupt if not using interrupt names) as primary interrupt for the slave.		interrupt if not using interrupt names) as primary interrupt for the slave.

			Alternatively, devices supporting SMbus Host Notify, and connected to
			adapters that support this feature, may use "host-notify" property. I2C
			core will create a virtual interrupt for Host Notify and assign it as
			primary interrupt for the slave.

	Also, if device is marked as a wakeup source, I2C core will set up "wakeup"		Also, if device is marked as a wakeup source, I2C core will set up "wakeup"
	interrupt for the device. If "wakeup" interrupt name is not present in the		interrupt for the device. If "wakeup" interrupt name is not present in the
	binding, then primary interrupt will be used as wakeup interrupt.		binding, then primary interrupt will be used as wakeup interrupt.

Documentation/vm/page_frags

0 → 100644

+42 −0

Original line number	Original line	Diff line number	Diff line
			Page fragments
			--------------

			A page fragment is an arbitrary-length arbitrary-offset area of memory
			which resides within a 0 or higher order compound page. Multiple
			fragments within that page are individually refcounted, in the page's
			reference counter.

			The page_frag functions, page_frag_alloc and page_frag_free, provide a
			simple allocation framework for page fragments. This is used by the
			network stack and network device drivers to provide a backing region of
			memory for use as either an sk_buff->head, or to be used in the "frags"
			portion of skb_shared_info.

			In order to make use of the page fragment APIs a backing page fragment
			cache is needed. This provides a central point for the fragment allocation
			and tracks allows multiple calls to make use of a cached page. The
			advantage to doing this is that multiple calls to get_page can be avoided
			which can be expensive at allocation time. However due to the nature of
			this caching it is required that any calls to the cache be protected by
			either a per-cpu limitation, or a per-cpu limitation and forcing interrupts
			to be disabled when executing the fragment allocation.

			The network stack uses two separate caches per CPU to handle fragment
			allocation. The netdev_alloc_cache is used by callers making use of the
			__netdev_alloc_frag and __netdev_alloc_skb calls. The napi_alloc_cache is
			used by callers of the __napi_alloc_frag and __napi_alloc_skb calls. The
			main difference between these two calls is the context in which they may be
			called. The "netdev" prefixed functions are usable in any context as these
			functions will disable interrupts, while the "napi" prefixed functions are
			only usable within the softirq context.

			Many network device drivers use a similar methodology for allocating page
			fragments, but the page fragments are cached at the ring or descriptor
			level. In order to enable these cases it is necessary to provide a generic
			way of tearing down a page cache. For this reason __page_frag_cache_drain
			was implemented. It allows for freeing multiple references from a single
			page via a single call. The advantage to doing this is that it allows for
			cleaning up the multiple references that were added to a page in order to
			avoid calling get_page per allocation.

			Alexander Duyck, Nov 29, 2016.

MAINTAINERS

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -81,7 +81,6 @@ Descriptions of section entries:
	Q: Patchwork web based patch tracking system site		Q: Patchwork web based patch tracking system site
	T: SCM tree type and location.		T: SCM tree type and location.
	Type is one of: git, hg, quilt, stgit, topgit		Type is one of: git, hg, quilt, stgit, topgit
	B: Bug tracking system location.
	S: Status, one of the following:		S: Status, one of the following:
	Supported: Someone is actually paid to look after this.		Supported: Someone is actually paid to look after this.
	Maintained: Someone actually looks after it.		Maintained: Someone actually looks after it.
	@@ -2194,14 +2193,6 @@ L: alsa-devel@alsa-project.org (moderated for non-subscribers)
	S: Supported		S: Supported
	F: sound/soc/atmel		F: sound/soc/atmel

	ATMEL DMA DRIVER
	M: Nicolas Ferre <nicolas.ferre@atmel.com>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	S: Supported
	F: drivers/dma/at_hdmac.c
	F: drivers/dma/at_hdmac_regs.h
	F: include/linux/platform_data/dma-atmel.h

	ATMEL XDMA DRIVER		ATMEL XDMA DRIVER
	M: Ludovic Desroches <ludovic.desroches@atmel.com>		M: Ludovic Desroches <ludovic.desroches@atmel.com>
	L: linux-arm-kernel@lists.infradead.org		L: linux-arm-kernel@lists.infradead.org
	@@ -4117,7 +4108,7 @@ F: drivers/gpu/drm/cirrus/
	RADEON and AMDGPU DRM DRIVERS		RADEON and AMDGPU DRM DRIVERS
	M: Alex Deucher <alexander.deucher@amd.com>		M: Alex Deucher <alexander.deucher@amd.com>
	M: Christian König <christian.koenig@amd.com>		M: Christian König <christian.koenig@amd.com>
	L: dri-devel@lists.freedesktop.org		L: amd-gfx@lists.freedesktop.org
	T: git git://people.freedesktop.org/~agd5f/linux		T: git git://people.freedesktop.org/~agd5f/linux
	S: Supported		S: Supported
	F: drivers/gpu/drm/radeon/		F: drivers/gpu/drm/radeon/
	@@ -8179,6 +8170,15 @@ S: Maintained
	F: drivers/tty/serial/atmel_serial.c		F: drivers/tty/serial/atmel_serial.c
	F: include/linux/atmel_serial.h		F: include/linux/atmel_serial.h

			MICROCHIP / ATMEL DMA DRIVER
			M: Ludovic Desroches <ludovic.desroches@microchip.com>
			L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
			L: dmaengine@vger.kernel.org
			S: Supported
			F: drivers/dma/at_hdmac.c
			F: drivers/dma/at_hdmac_regs.h
			F: include/linux/platform_data/dma-atmel.h

	MICROCHIP / ATMEL ISC DRIVER		MICROCHIP / ATMEL ISC DRIVER
	M: Songjun Wu <songjun.wu@microchip.com>		M: Songjun Wu <songjun.wu@microchip.com>
	L: linux-media@vger.kernel.org		L: linux-media@vger.kernel.org

Original line number	Original line	Diff line number	Diff line
	@@ -137,6 +137,7 @@ Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
	Rudolf Marek <R.Marek@sh.cvut.cz>		Rudolf Marek <R.Marek@sh.cvut.cz>
	Rui Saraiva <rmps@joel.ist.utl.pt>		Rui Saraiva <rmps@joel.ist.utl.pt>
	Sachin P Sant <ssant@in.ibm.com>		Sachin P Sant <ssant@in.ibm.com>
			Sarangdhar Joshi <spjoshi@codeaurora.org>
	Sam Ravnborg <sam@mars.ravnborg.org>		Sam Ravnborg <sam@mars.ravnborg.org>
	Santosh Shilimkar <ssantosh@kernel.org>		Santosh Shilimkar <ssantosh@kernel.org>
	Santosh Shilimkar <santosh.shilimkar@oracle.org>		Santosh Shilimkar <santosh.shilimkar@oracle.org>
	@@ -150,10 +151,13 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
	Simon Kelley <simon@thekelleys.org.uk>		Simon Kelley <simon@thekelleys.org.uk>
	Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
	Stephen Hemminger <shemminger@osdl.org>		Stephen Hemminger <shemminger@osdl.org>
			Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
			Subhash Jadavani <subhashj@codeaurora.org>
	Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>		Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
	Sumit Semwal <sumit.semwal@ti.com>		Sumit Semwal <sumit.semwal@ti.com>
	Tejun Heo <htejun@gmail.com>		Tejun Heo <htejun@gmail.com>
	Thomas Graf <tgraf@suug.ch>		Thomas Graf <tgraf@suug.ch>
			Thomas Pedersen <twp@codeaurora.org>
	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 <ukleinek@informatik.uni-freiburg.de>		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>