Commit 182ad468 authored by David S. Miller's avatar David S. Miller
Browse files

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



Conflicts:
	drivers/net/ethernet/cavium/Kconfig

The cavium conflict was overlapping dependency
changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e8fed985 5b3e2e14

Documentation/devicetree/bindings/dma/apm-xgene-dma.txt

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ Example: 
			device_type = "dma";

			reg = <0x0 0x1f270000 0x0 0x10000>,

			      <0x0 0x1f200000 0x0 0x10000>,

			      <0x0 0x1b008000 0x0 0x2000>,

			      <0x0 0x1b000000 0x0 0x400000>,

			      <0x0 0x1054a000 0x0 0x100>;

			interrupts = <0x0 0x82 0x4>,

				     <0x0 0xb8 0x4>,

Documentation/devicetree/bindings/phy/ti-phy.txt

+16 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ Optional properties: 
 - id: If there are multiple instance of the same type, in order to

   differentiate between each instance "id" can be used (e.g., multi-lane PCIe

   PHY). If "id" is not provided, it is set to default value of '1'.

 - syscon-pllreset: Handle to system control region that contains the

   CTRL_CORE_SMA_SW_0 register and register offset to the CTRL_CORE_SMA_SW_0

   register that contains the SATA_PLL_SOFT_RESET bit. Only valid for sata_phy.



This is usually a subnode of ocp2scp to which it is connected.
@@ -100,3 +103,16 @@ usb3phy@4a084400 { 
			"sysclk",

			"refclk";

};



sata_phy: phy@4A096000 {

	compatible = "ti,phy-pipe3-sata";

	reg = <0x4A096000 0x80>, /* phy_rx */

	      <0x4A096400 0x64>, /* phy_tx */

	      <0x4A096800 0x40>; /* pll_ctrl */

	reg-names = "phy_rx", "phy_tx", "pll_ctrl";

	ctrl-module = <&omap_control_sata>;

	clocks = <&sys_clkin1>, <&sata_ref_clk>;

	clock-names = "sysclk", "refclk";

	syscon-pllreset = <&scm_conf 0x3fc>;

	#phy-cells = <0>;

};

Documentation/input/alps.txt

+4 −2
Original line number Diff line number Diff line
@@ -119,8 +119,10 @@ ALPS Absolute Mode - Protocol Version 2 
 byte 5:  0   z6   z5   z4   z3   z2   z1   z0



Protocol Version 2 DualPoint devices send standard PS/2 mouse packets for

the DualPoint Stick. For non interleaved dualpoint devices the pointingstick

buttons get reported separately in the PSM, PSR and PSL bits.

the DualPoint Stick. The M, R and L bits signal the combined status of both

the pointingstick and touchpad buttons, except for Dell dualpoint devices

where the pointingstick buttons get reported separately in the PSM, PSR

and PSL bits.



Dualpoint device -- interleaved packet format

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

MAINTAINERS

+5 −1
Original line number Diff line number Diff line
@@ -5600,6 +5600,7 @@ F: kernel/irq/ 
IRQCHIP DRIVERS

M:	Thomas Gleixner <tglx@linutronix.de>

M:	Jason Cooper <jason@lakedaemon.net>

M:	Marc Zyngier <marc.zyngier@arm.com>

L:	linux-kernel@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@ -5608,11 +5609,14 @@ F: Documentation/devicetree/bindings/interrupt-controller/ 
F:	drivers/irqchip/



IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)

M:	Benjamin Herrenschmidt <benh@kernel.crashing.org>

M:	Jiang Liu <jiang.liu@linux.intel.com>

M:	Marc Zyngier <marc.zyngier@arm.com>

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core

F:	Documentation/IRQ-domain.txt

F:	include/linux/irqdomain.h

F:	kernel/irq/irqdomain.c

F:	kernel/irq/msi.c



ISAPNP

M:	Jaroslav Kysela <perex@perex.cz>

Makefile

+8 −3
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 2

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc6

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*
@@ -597,6 +597,11 @@ endif # $(dot-config) 
# Defaults to vmlinux, but the arch makefile usually adds further targets

all: vmlinux



# The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default

# values of the respective KBUILD_* variables

ARCH_CPPFLAGS :=

ARCH_AFLAGS :=

ARCH_CFLAGS :=

include arch/$(SRCARCH)/Makefile



KBUILD_CFLAGS	+= $(call cc-option,-fno-delete-null-pointer-checks,)
@@ -848,10 +853,10 @@ export mod_strip_cmd 
mod_compress_cmd = true

ifdef CONFIG_MODULE_COMPRESS

  ifdef CONFIG_MODULE_COMPRESS_GZIP

    mod_compress_cmd = gzip -n

    mod_compress_cmd = gzip -n -f

  endif # CONFIG_MODULE_COMPRESS_GZIP

  ifdef CONFIG_MODULE_COMPRESS_XZ

    mod_compress_cmd = xz

    mod_compress_cmd = xz -f

  endif # CONFIG_MODULE_COMPRESS_XZ

endif # CONFIG_MODULE_COMPRESS

export mod_compress_cmd