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

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

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



Both conflict were simple overlapping changes.

In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the
conversion of the driver in net-next to use in-netdev stats.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1f4407e2 94836ecf

Documentation/devicetree/bindings/pci/hisilicon-pcie.txt

+8 −2
Original line number Original line Diff line number Diff line
@@ -44,13 +44,19 @@ Hip05 Example (note that Hip06 is the same except compatible): 
	};

	};





HiSilicon Hip06/Hip07 PCIe host bridge DT (almost-ECAM) description.

HiSilicon Hip06/Hip07 PCIe host bridge DT (almost-ECAM) description.



Some BIOSes place the host controller in a mode where it is ECAM

compliant for all devices other than the root complex. In such cases,

the host controller should be described as below.



The properties and their meanings are identical to those described in

The properties and their meanings are identical to those described in

host-generic-pci.txt except as listed below.

host-generic-pci.txt except as listed below.





Properties of the host controller node that differ from

Properties of the host controller node that differ from

host-generic-pci.txt:

host-generic-pci.txt:





- compatible     : Must be "hisilicon,pcie-almost-ecam"

- compatible     : Must be "hisilicon,hip06-pcie-ecam", or

		   "hisilicon,hip07-pcie-ecam"





- reg            : Two entries: First the ECAM configuration space for any

- reg            : Two entries: First the ECAM configuration space for any

		   other bus underneath the root bus. Second, the base

		   other bus underneath the root bus. Second, the base
@@ -59,7 +65,7 @@ host-generic-pci.txt: 




Example:

Example:

	pcie0: pcie@a0090000 {

	pcie0: pcie@a0090000 {

		compatible = "hisilicon,pcie-almost-ecam";

		compatible = "hisilicon,hip06-pcie-ecam";

		reg = <0 0xb0000000 0 0x2000000>,  /*  ECAM configuration space */

		reg = <0 0xb0000000 0 0x2000000>,  /*  ECAM configuration space */

		      <0 0xa0090000 0 0x10000>; /* host bridge registers */

		      <0 0xa0090000 0 0x10000>; /* host bridge registers */

		bus-range = <0  31>;

		bus-range = <0  31>;

MAINTAINERS

+16 −2
Original line number Original line Diff line number Diff line
@@ -2592,12 +2592,26 @@ F: include/uapi/linux/if_bonding.h 




BPF (Safe dynamic programs and tools)

BPF (Safe dynamic programs and tools)

M:	Alexei Starovoitov <ast@kernel.org>

M:	Alexei Starovoitov <ast@kernel.org>

M:	Daniel Borkmann <daniel@iogearbox.net>

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

L:	linux-kernel@vger.kernel.org

L:	linux-kernel@vger.kernel.org

S:	Supported

S:	Supported

F:	arch/x86/net/bpf_jit*

F:	Documentation/networking/filter.txt

F:	include/linux/bpf*

F:	include/linux/filter.h

F:	include/uapi/linux/bpf*

F:	include/uapi/linux/filter.h

F:	kernel/bpf/

F:	kernel/bpf/

F:	tools/testing/selftests/bpf/

F:	kernel/trace/bpf_trace.c

F:	lib/test_bpf.c

F:	lib/test_bpf.c

F:	net/bpf/

F:	net/core/filter.c

F:	net/sched/act_bpf.c

F:	net/sched/cls_bpf.c

F:	samples/bpf/

F:	tools/net/bpf*

F:	tools/testing/selftests/bpf/





BROADCOM B44 10/100 ETHERNET DRIVER

BROADCOM B44 10/100 ETHERNET DRIVER

M:	Michael Chan <michael.chan@broadcom.com>

M:	Michael Chan <michael.chan@broadcom.com>
@@ -8777,6 +8791,7 @@ W: http://www.linuxfoundation.org/en/Net 
Q:	http://patchwork.ozlabs.org/project/netdev/list/

Q:	http://patchwork.ozlabs.org/project/netdev/list/

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

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

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git

B:	mailto:netdev@vger.kernel.org

S:	Maintained

S:	Maintained

F:	net/

F:	net/

F:	include/net/

F:	include/net/
@@ -12491,7 +12506,6 @@ F: drivers/clk/ti/ 
F:	include/linux/clk/ti.h

F:	include/linux/clk/ti.h





TI ETHERNET SWITCH DRIVER (CPSW)

TI ETHERNET SWITCH DRIVER (CPSW)

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

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

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

L:	linux-omap@vger.kernel.org

L:	linux-omap@vger.kernel.org

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

arch/powerpc/include/asm/exception-64s.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -236,9 +236,9 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) 
	mtctr	reg;							\

	mtctr	reg;							\

	bctr

	bctr





#define BRANCH_LINK_TO_FAR(reg, label)					\

#define BRANCH_LINK_TO_FAR(label)					\

	__LOAD_FAR_HANDLER(reg, label);					\

	__LOAD_FAR_HANDLER(r12, label);					\

	mtctr	reg;							\

	mtctr	r12;							\

	bctrl

	bctrl





/*

/*
@@ -265,7 +265,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) 
#define BRANCH_TO_COMMON(reg, label)					\

#define BRANCH_TO_COMMON(reg, label)					\

	b	label

	b	label





#define BRANCH_LINK_TO_FAR(reg, label)					\

#define BRANCH_LINK_TO_FAR(label)					\

	bl	label

	bl	label





#define BRANCH_TO_KVM(reg, label)					\

#define BRANCH_TO_KVM(reg, label)					\

arch/powerpc/kernel/entry_64.S

+3 −3
Original line number Original line Diff line number Diff line
@@ -689,7 +689,7 @@ resume_kernel: 




	addi	r8,r1,INT_FRAME_SIZE	/* Get the kprobed function entry */

	addi	r8,r1,INT_FRAME_SIZE	/* Get the kprobed function entry */





	lwz	r3,GPR1(r1)

	ld	r3,GPR1(r1)

	subi	r3,r3,INT_FRAME_SIZE	/* dst: Allocate a trampoline exception frame */

	subi	r3,r3,INT_FRAME_SIZE	/* dst: Allocate a trampoline exception frame */

	mr	r4,r1			/* src:  current exception frame */

	mr	r4,r1			/* src:  current exception frame */

	mr	r1,r3			/* Reroute the trampoline frame to r1 */

	mr	r1,r3			/* Reroute the trampoline frame to r1 */
@@ -703,8 +703,8 @@ resume_kernel: 
	addi	r6,r6,8

	addi	r6,r6,8

	bdnz	2b

	bdnz	2b





	/* Do real store operation to complete stwu */

	/* Do real store operation to complete stdu */

	lwz	r5,GPR1(r1)

	ld	r5,GPR1(r1)

	std	r8,0(r5)

	std	r8,0(r5)





	/* Clear _TIF_EMULATE_STACK_STORE flag */

	/* Clear _TIF_EMULATE_STACK_STORE flag */

arch/powerpc/kernel/exceptions-64s.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -982,7 +982,7 @@ TRAMP_REAL_BEGIN(hmi_exception_early) 
	EXCEPTION_PROLOG_COMMON_2(PACA_EXGEN)

	EXCEPTION_PROLOG_COMMON_2(PACA_EXGEN)

	EXCEPTION_PROLOG_COMMON_3(0xe60)

	EXCEPTION_PROLOG_COMMON_3(0xe60)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	addi	r3,r1,STACK_FRAME_OVERHEAD

	BRANCH_LINK_TO_FAR(r4, hmi_exception_realmode)

	BRANCH_LINK_TO_FAR(hmi_exception_realmode) /* Function call ABI */

	/* Windup the stack. */

	/* Windup the stack. */

	/* Move original HSRR0 and HSRR1 into the respective regs */

	/* Move original HSRR0 and HSRR1 into the respective regs */

	ld	r9,_MSR(r1)

	ld	r9,_MSR(r1)