Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 545feeff authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-4.6-rc7' of... 

Merge tag 'usb-serial-4.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-next

Johan writes:

USB-serial fixes for v4.6-rc7

Here are some more new device ids.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents 792f7525 74d2a91a

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ Felix Kuhling <fxkuehl@gmx.de> 
Felix Moeller <felix@derklecks.de>

Filipe Lautert <filipe@icewall.org>

Franck Bui-Huu <vagabon.xyz@gmail.com>

Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>

Frank Zago <fzago@systemfabricworks.com>

Greg Kroah-Hartman <greg@echidna.(none)>

Greg Kroah-Hartman <gregkh@suse.de>
@@ -79,6 +82,7 @@ Kay Sievers <kay.sievers@vrfy.org> 
Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

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>

Documentation/devicetree/bindings/arm/cpus.txt

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ nodes to be present and contain the properties described below. 
			  can be one of:

			    "allwinner,sun6i-a31"

			    "allwinner,sun8i-a23"

			    "arm,psci"

			    "arm,realview-smp"

			    "brcm,bcm-nsp-smp"

			    "brcm,brahma-b15"

Documentation/devicetree/bindings/i2c/i2c-rk3x.txt

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ RK3xxx SoCs. 
Required properties :



 - reg : Offset and length of the register set for the device

 - compatible : should be "rockchip,rk3066-i2c", "rockchip,rk3188-i2c" or

		"rockchip,rk3288-i2c".

 - compatible : should be "rockchip,rk3066-i2c", "rockchip,rk3188-i2c",

		"rockchip,rk3228-i2c" or "rockchip,rk3288-i2c".

 - interrupts : interrupt number

 - clocks : parent clock

Documentation/sysctl/vm.txt

+10 −9
Original line number Diff line number Diff line
@@ -581,15 +581,16 @@ Specify "[Nn]ode" for node order 
"Zone Order" orders the zonelists by zone type, then by node within each

zone.  Specify "[Zz]one" for zone order.



Specify "[Dd]efault" to request automatic configuration.  Autoconfiguration

will select "node" order in following case.

(1) if the DMA zone does not exist or

(2) if the DMA zone comprises greater than 50% of the available memory or

(3) if any node's DMA zone comprises greater than 70% of its local memory and

    the amount of local memory is big enough.



Otherwise, "zone" order will be selected. Default order is recommended unless

this is causing problems for your system/application.

Specify "[Dd]efault" to request automatic configuration.



On 32-bit, the Normal zone needs to be preserved for allocations accessible

by the kernel, so "zone" order will be selected.



On 64-bit, devices that require DMA32/DMA are relatively rare, so "node"

order will be selected.



Default order is recommended unless this is causing problems for your

system/application.



==============================================================

MAINTAINERS

+12 −3
Original line number Diff line number Diff line
@@ -6027,7 +6027,7 @@ F: include/scsi/*iscsi* 


ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR

M:	Or Gerlitz <ogerlitz@mellanox.com>

M:	Sagi Grimberg <sagig@mellanox.com>

M:	Sagi Grimberg <sagi@grimberg.me>

M:	Roi Dayan <roid@mellanox.com>

L:	linux-rdma@vger.kernel.org

S:	Supported
@@ -6037,7 +6037,7 @@ Q: http://patchwork.kernel.org/project/linux-rdma/list/ 
F:	drivers/infiniband/ulp/iser/



ISCSI EXTENSIONS FOR RDMA (ISER) TARGET

M:	Sagi Grimberg <sagig@mellanox.com>

M:	Sagi Grimberg <sagi@grimberg.me>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master

L:	linux-rdma@vger.kernel.org

L:	target-devel@vger.kernel.org
@@ -6400,7 +6400,7 @@ F: mm/kmemleak.c 
F:	mm/kmemleak-test.c



KPROBES

M:	Ananth N Mavinakayanahalli <ananth@in.ibm.com>

M:	Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>

M:	Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>

M:	"David S. Miller" <davem@davemloft.net>

M:	Masami Hiramatsu <mhiramat@kernel.org>
@@ -11071,6 +11071,15 @@ S: Maintained 
F:	drivers/clk/ti/

F:	include/linux/clk/ti.h



TI ETHERNET SWITCH DRIVER (CPSW)

M:	Mugunthan V N <mugunthanvnm@ti.com>

R:	Grygorii Strashko <grygorii.strashko@ti.com>

L:	linux-omap@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/ti/cpsw*

F:	drivers/net/ethernet/ti/davinci*



TI FLASH MEDIA INTERFACE DRIVER

M:	Alex Dubov <oakad@yahoo.com>

S:	Maintained