Skip to content

Commit 81bf1c6

Browse files
ummakynesummakynes
committed
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Resolve conflicts with conntrack template fixes. Conflicts: net/netfilter/nf_conntrack_core.c net/netfilter/nf_synproxy_core.c net/netfilter/xt_CT.c Signed-off-by: Pablo Neira Ayuso <[email protected]>
2 parents 8cfd23e + 938049e commit 81bf1c6

File tree

855 files changed

+24295
-7762
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

855 files changed

+24295
-7762
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Example:
3535
device_type = "dma";
3636
reg = <0x0 0x1f270000 0x0 0x10000>,
3737
<0x0 0x1f200000 0x0 0x10000>,
38-
<0x0 0x1b008000 0x0 0x2000>,
38+
<0x0 0x1b000000 0x0 0x400000>,
3939
<0x0 0x1054a000 0x0 0x100>;
4040
interrupts = <0x0 0x82 0x4>,
4141
<0x0 0xb8 0x4>,

‎Documentation/devicetree/bindings/net/dsa/dsa.txt

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,10 @@ Note that a port labelled "dsa" will imply checking for the uplink phandle
4444
described below.
4545

4646
Optionnal property:
47-
- link : Should be a phandle to another switch's DSA port.
47+
- link : Should be a list of phandles to another switch's DSA port.
4848
This property is only used when switches are being
49-
chained/cascaded together.
49+
chained/cascaded together. This port is used as outgoing port
50+
towards the phandle port, which can be more than one hop away.
5051

5152
- phy-handle : Phandle to a PHY on an external MDIO bus, not the
5253
switch internal one. See
@@ -58,6 +59,10 @@ Optionnal property:
5859
Documentation/devicetree/bindings/net/ethernet.txt
5960
for details.
6061

62+
- mii-bus : Should be a phandle to a valid MDIO bus device node.
63+
This mii-bus will be used in preference to the
64+
global dsa,mii-bus defined above, for this switch.
65+
6166
Optional subnodes:
6267
- fixed-link : Fixed-link subnode describing a link to a non-MDIO
6368
managed entity. See
@@ -96,22 +101,43 @@ Example:
96101
label = "cpu";
97102
};
98103

99-
switch0uplink: port@6 {
104+
switch0port6: port@6 {
100105
reg = <6>;
101106
label = "dsa";
102-
link = <&switch1uplink>;
107+
link = <&switch1port0
108+
&switch2port0>;
103109
};
104110
};
105111

106112
switch@1 {
107113
#address-cells = <1>;
108114
#size-cells = <0>;
109115
reg = <17 1>; /* MDIO address 17, switch 1 in tree */
116+
mii-bus = <&mii_bus1>;
117+
118+
switch1port0: port@0 {
119+
reg = <0>;
120+
label = "dsa";
121+
link = <&switch0port6>;
122+
};
123+
switch1port1: port@1 {
124+
reg = <1>;
125+
label = "dsa";
126+
link = <&switch2port1>;
127+
};
128+
};
129+
130+
switch@2 {
131+
#address-cells = <1>;
132+
#size-cells = <0>;
133+
reg = <18 2>; /* MDIO address 18, switch 2 in tree */
134+
mii-bus = <&mii_bus1>;
110135

111-
switch1uplink: port@0 {
136+
switch2port0: port@0 {
112137
reg = <0>;
113138
label = "dsa";
114-
link = <&switch0uplink>;
139+
link = <&switch1port1
140+
&switch0port6>;
115141
};
116142
};
117143
};

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ Optional properties:
8282
- id: If there are multiple instance of the same type, in order to
8383
differentiate between each instance "id" can be used (e.g., multi-lane PCIe
8484
PHY). If "id" is not provided, it is set to default value of '1'.
85+
- syscon-pllreset: Handle to system control region that contains the
86+
CTRL_CORE_SMA_SW_0 register and register offset to the CTRL_CORE_SMA_SW_0
87+
register that contains the SATA_PLL_SOFT_RESET bit. Only valid for sata_phy.
8588

8689
This is usually a subnode of ocp2scp to which it is connected.
8790

@@ -100,3 +103,16 @@ usb3phy@4a084400 {
100103
"sysclk",
101104
"refclk";
102105
};
106+
107+
sata_phy: phy@4A096000 {
108+
compatible = "ti,phy-pipe3-sata";
109+
reg = <0x4A096000 0x80>, /* phy_rx */
110+
<0x4A096400 0x64>, /* phy_tx */
111+
<0x4A096800 0x40>; /* pll_ctrl */
112+
reg-names = "phy_rx", "phy_tx", "pll_ctrl";
113+
ctrl-module = <&omap_control_sata>;
114+
clocks = <&sys_clkin1>, <&sata_ref_clk>;
115+
clock-names = "sysclk", "refclk";
116+
syscon-pllreset = <&scm_conf 0x3fc>;
117+
#phy-cells = <0>;
118+
};

‎Documentation/input/alps.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,10 @@ ALPS Absolute Mode - Protocol Version 2
119119
byte 5: 0 z6 z5 z4 z3 z2 z1 z0
120120

121121
Protocol Version 2 DualPoint devices send standard PS/2 mouse packets for
122-
the DualPoint Stick. For non interleaved dualpoint devices the pointingstick
123-
buttons get reported separately in the PSM, PSR and PSL bits.
122+
the DualPoint Stick. The M, R and L bits signal the combined status of both
123+
the pointingstick and touchpad buttons, except for Dell dualpoint devices
124+
where the pointingstick buttons get reported separately in the PSM, PSR
125+
and PSL bits.
124126

125127
Dualpoint device -- interleaved packet format
126128
---------------------------------------------

‎Documentation/networking/6lowpan.txt

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
2+
Netdev private dataroom for 6lowpan interfaces:
3+
4+
All 6lowpan able net devices, means all interfaces with ARPHRD_6LOWPAN,
5+
must have "struct lowpan_priv" placed at beginning of netdev_priv.
6+
7+
The priv_size of each interface should be calculate by:
8+
9+
dev->priv_size = LOWPAN_PRIV_SIZE(LL_6LOWPAN_PRIV_DATA);
10+
11+
Where LL_PRIV_6LOWPAN_DATA is sizeof linklayer 6lowpan private data struct.
12+
To access the LL_PRIV_6LOWPAN_DATA structure you can cast:
13+
14+
lowpan_priv(dev)-priv;
15+
16+
to your LL_6LOWPAN_PRIV_DATA structure.
17+
18+
Before registering the lowpan netdev interface you must run:
19+
20+
lowpan_netdev_setup(dev, LOWPAN_LLTYPE_FOOBAR);
21+
22+
wheres LOWPAN_LLTYPE_FOOBAR is a define for your 6LoWPAN linklayer type of
23+
enum lowpan_lltypes.
24+
25+
Example to evaluate the private usually you can do:
26+
27+
static inline sturct lowpan_priv_foobar *
28+
lowpan_foobar_priv(struct net_device *dev)
29+
{
30+
return (sturct lowpan_priv_foobar *)lowpan_priv(dev)->priv;
31+
}
32+
33+
switch (dev->type) {
34+
case ARPHRD_6LOWPAN:
35+
lowpan_priv = lowpan_priv(dev);
36+
/* do great stuff which is ARPHRD_6LOWPAN related */
37+
switch (lowpan_priv->lltype) {
38+
case LOWPAN_LLTYPE_FOOBAR:
39+
/* do 802.15.4 6LoWPAN handling here */
40+
lowpan_foobar_priv(dev)->bar = foo;
41+
break;
42+
...
43+
}
44+
break;
45+
...
46+
}
47+
48+
In case of generic 6lowpan branch ("net/6lowpan") you can remove the check
49+
on ARPHRD_6LOWPAN, because you can be sure that these function are called
50+
by ARPHRD_6LOWPAN interfaces.

‎Documentation/networking/ip-sysctl.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,6 +1181,11 @@ tag - INTEGER
11811181
Allows you to write a number, which can be used as required.
11821182
Default value is 0.
11831183

1184+
xfrm4_gc_thresh - INTEGER
1185+
The threshold at which we will start garbage collecting for IPv4
1186+
destination cache entries. At twice this value the system will
1187+
refuse new allocations.
1188+
11841189
Alexey Kuznetsov.
11851190
[email protected]
11861191

@@ -1617,6 +1622,11 @@ ratelimit - INTEGER
16171622
otherwise the minimal space between responses in milliseconds.
16181623
Default: 1000
16191624

1625+
xfrm6_gc_thresh - INTEGER
1626+
The threshold at which we will start garbage collecting for IPv6
1627+
destination cache entries. At twice this value the system will
1628+
refuse new allocations.
1629+
16201630

16211631
IPv6 Update by:
16221632
Pekka Savola <[email protected]>

‎Documentation/networking/switchdev.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,4 +367,5 @@ driver's rocker_port_ipv4_resolve() for an example.
367367

368368
The driver can monitor for updates to arp_tbl using the netevent notifier
369369
NETEVENT_NEIGH_UPDATE. The device can be programmed with resolved nexthops
370-
for the routes as arp_tbl updates.
370+
for the routes as arp_tbl updates. The driver implements ndo_neigh_destroy
371+
to know when arp_tbl neighbor entries are purged from the port.

‎Documentation/networking/vxlan.txt

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
11
Virtual eXtensible Local Area Networking documentation
22
======================================================
33

4-
The VXLAN protocol is a tunnelling protocol that is designed to
5-
solve the problem of limited number of available VLAN's (4096).
6-
With VXLAN identifier is expanded to 24 bits.
7-
8-
It is a draft RFC standard, that is implemented by Cisco Nexus,
9-
Vmware and Brocade. The protocol runs over UDP using a single
10-
destination port (still not standardized by IANA).
11-
This document describes the Linux kernel tunnel device,
12-
there is also an implantation of VXLAN for Openvswitch.
13-
14-
Unlike most tunnels, a VXLAN is a 1 to N network, not just point
15-
to point. A VXLAN device can either dynamically learn the IP address
16-
of the other end, in a manner similar to a learning bridge, or the
17-
forwarding entries can be configured statically.
18-
19-
The management of vxlan is done in a similar fashion to it's
20-
too closest neighbors GRE and VLAN. Configuring VXLAN requires
21-
the version of iproute2 that matches the kernel release
22-
where VXLAN was first merged upstream.
4+
The VXLAN protocol is a tunnelling protocol designed to solve the
5+
problem of limited VLAN IDs (4096) in IEEE 802.1q. With VXLAN the
6+
size of the identifier is expanded to 24 bits (16777216).
7+
8+
VXLAN is described by IETF RFC 7348, and has been implemented by a
9+
number of vendors. The protocol runs over UDP using a single
10+
destination port. This document describes the Linux kernel tunnel
11+
device, there is also a separate implementation of VXLAN for
12+
Openvswitch.
13+
14+
Unlike most tunnels, a VXLAN is a 1 to N network, not just point to
15+
point. A VXLAN device can learn the IP address of the other endpoint
16+
either dynamically in a manner similar to a learning bridge, or make
17+
use of statically-configured forwarding entries.
18+
19+
The management of vxlan is done in a manner similar to its two closest
20+
neighbors GRE and VLAN. Configuring VXLAN requires the version of
21+
iproute2 that matches the kernel release where VXLAN was first merged
22+
upstream.
2323

2424
1. Create vxlan device
25-
# ip li add vxlan0 type vxlan id 42 group 239.1.1.1 dev eth1
26-
27-
This creates a new device (vxlan0). The device uses the
28-
the multicast group 239.1.1.1 over eth1 to handle packets where
29-
no entry is in the forwarding table.
25+
# ip link add vxlan0 type vxlan id 42 group 239.1.1.1 dev eth1 dstport 4789
26+
27+
This creates a new device named vxlan0. The device uses the multicast
28+
group 239.1.1.1 over eth1 to handle traffic for which there is no
29+
entry in the forwarding table. The destination port number is set to
30+
the IANA-assigned value of 4789. The Linux implementation of VXLAN
31+
pre-dates the IANA's selection of a standard destination port number
32+
and uses the Linux-selected value by default to maintain backwards
33+
compatibility.
3034

3135
2. Delete vxlan device
3236
# ip link delete vxlan0

‎MAINTAINERS

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ L: [email protected]
158158
S: Maintained
159159
F: net/6lowpan/
160160
F: include/net/6lowpan.h
161+
F: Documentation/networking/6lowpan.txt
161162

162163
6PACK NETWORK DRIVER FOR AX.25
163164
M: Andreas Koensgen <[email protected]>
@@ -5600,6 +5601,7 @@ F: kernel/irq/
56005601
IRQCHIP DRIVERS
56015602
M: Thomas Gleixner <[email protected]>
56025603
M: Jason Cooper <[email protected]>
5604+
M: Marc Zyngier <[email protected]>
56035605
L: [email protected]
56045606
S: Maintained
56055607
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@ -5608,11 +5610,14 @@ F: Documentation/devicetree/bindings/interrupt-controller/
56085610
F: drivers/irqchip/
56095611

56105612
IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
5611-
M: Benjamin Herrenschmidt <[email protected]>
5613+
M: Jiang Liu <[email protected]>
5614+
M: Marc Zyngier <[email protected]>
56125615
S: Maintained
5616+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
56135617
F: Documentation/IRQ-domain.txt
56145618
F: include/linux/irqdomain.h
56155619
F: kernel/irq/irqdomain.c
5620+
F: kernel/irq/msi.c
56165621

56175622
ISAPNP
56185623
M: Jaroslav Kysela <[email protected]>

‎Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 4
22
PATCHLEVEL = 2
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc4
4+
EXTRAVERSION = -rc6
55
NAME = Hurr durr I'ma sheep
66

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

600+
# The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default
601+
# values of the respective KBUILD_* variables
602+
ARCH_CPPFLAGS :=
603+
ARCH_AFLAGS :=
604+
ARCH_CFLAGS :=
600605
include arch/$(SRCARCH)/Makefile
601606

602607
KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)
@@ -848,10 +853,10 @@ export mod_strip_cmd
848853
mod_compress_cmd = true
849854
ifdef CONFIG_MODULE_COMPRESS
850855
ifdef CONFIG_MODULE_COMPRESS_GZIP
851-
mod_compress_cmd = gzip -n
856+
mod_compress_cmd = gzip -n -f
852857
endif # CONFIG_MODULE_COMPRESS_GZIP
853858
ifdef CONFIG_MODULE_COMPRESS_XZ
854-
mod_compress_cmd = xz
859+
mod_compress_cmd = xz -f
855860
endif # CONFIG_MODULE_COMPRESS_XZ
856861
endif # CONFIG_MODULE_COMPRESS
857862
export mod_compress_cmd

‎arch/arc/Kconfig

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,11 +313,11 @@ config ARC_PAGE_SIZE_8K
313313

314314
config ARC_PAGE_SIZE_16K
315315
bool "16KB"
316-
depends on ARC_MMU_V3
316+
depends on ARC_MMU_V3 || ARC_MMU_V4
317317

318318
config ARC_PAGE_SIZE_4K
319319
bool "4KB"
320-
depends on ARC_MMU_V3
320+
depends on ARC_MMU_V3 || ARC_MMU_V4
321321

322322
endchoice
323323

@@ -365,6 +365,11 @@ config ARC_HAS_LLSC
365365
default y
366366
depends on !ARC_CANT_LLSC
367367

368+
config ARC_STAR_9000923308
369+
bool "Workaround for llock/scond livelock"
370+
default y
371+
depends on ISA_ARCV2 && SMP && ARC_HAS_LLSC
372+
368373
config ARC_HAS_SWAPE
369374
bool "Insn: SWAPE (endian-swap)"
370375
default y
@@ -379,6 +384,10 @@ config ARC_HAS_LL64
379384
dest operands with 2 possible source operands.
380385
default y
381386

387+
config ARC_HAS_DIV_REM
388+
bool "Insn: div, divu, rem, remu"
389+
default y
390+
382391
config ARC_HAS_RTC
383392
bool "Local 64-bit r/o cycle counter"
384393
default n

‎arch/arc/Makefile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,16 @@ cflags-$(atleast_gcc44) += -fsection-anchors
3636
cflags-$(CONFIG_ARC_HAS_LLSC) += -mlock
3737
cflags-$(CONFIG_ARC_HAS_SWAPE) += -mswape
3838

39+
ifdef CONFIG_ISA_ARCV2
40+
3941
ifndef CONFIG_ARC_HAS_LL64
40-
cflags-$(CONFIG_ISA_ARCV2) += -mno-ll64
42+
cflags-y += -mno-ll64
43+
endif
44+
45+
ifndef CONFIG_ARC_HAS_DIV_REM
46+
cflags-y += -mno-div-rem
47+
endif
48+
4149
endif
4250

4351
cflags-$(CONFIG_ARC_DW2_UNWIND) += -fasynchronous-unwind-tables

0 commit comments

Comments
 (0)