Skip to content

Commit 4e8f2fc

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 158f323 + 1b1bc42 commit 4e8f2fc

File tree

485 files changed

+4555
-2689
lines changed

Some content is hidden

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

485 files changed

+4555
-2689
lines changed

‎Documentation/devicetree/bindings/net/mediatek-net.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ have dual GMAC each represented by a child node..
77
* Ethernet controller node
88

99
Required properties:
10-
- compatible: Should be "mediatek,mt7623-eth"
10+
- compatible: Should be "mediatek,mt2701-eth"
1111
- reg: Address and length of the register set for the device
1212
- interrupts: Should contain the three frame engines interrupts in numeric
1313
order. These are fe_int0, fe_int1 and fe_int2.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ Optional Properties:
1919
specifications. If neither of these are specified, the default is to
2020
assume clause 22.
2121

22-
If the phy's identifier is known then the list may contain an entry
23-
of the form: "ethernet-phy-idAAAA.BBBB" where
22+
If the PHY reports an incorrect ID (or none at all) then the
23+
"compatible" list may contain an entry with the correct PHY ID in the
24+
form: "ethernet-phy-idAAAA.BBBB" where
2425
AAAA - The value of the 16 bit Phy Identifier 1 register as
2526
4 hex digits. This is the chip vendor OUI bits 3:18
2627
BBBB - The value of the 16 bit Phy Identifier 2 register as

‎Documentation/devicetree/bindings/spi/sh-msiof.txt

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
Renesas MSIOF spi controller
22

33
Required properties:
4-
- compatible : "renesas,msiof-<soctype>" for SoCs,
5-
"renesas,sh-msiof" for SuperH, or
6-
"renesas,sh-mobile-msiof" for SH Mobile series.
7-
Examples with soctypes are:
8-
"renesas,msiof-r8a7790" (R-Car H2)
4+
- compatible : "renesas,msiof-r8a7790" (R-Car H2)
95
"renesas,msiof-r8a7791" (R-Car M2-W)
106
"renesas,msiof-r8a7792" (R-Car V2H)
117
"renesas,msiof-r8a7793" (R-Car M2-N)
128
"renesas,msiof-r8a7794" (R-Car E2)
139
"renesas,msiof-r8a7796" (R-Car M3-W)
1410
"renesas,msiof-sh73a0" (SH-Mobile AG5)
11+
"renesas,sh-mobile-msiof" (generic SH-Mobile compatibile device)
12+
"renesas,rcar-gen2-msiof" (generic R-Car Gen2 compatible device)
13+
"renesas,rcar-gen3-msiof" (generic R-Car Gen3 compatible device)
14+
"renesas,sh-msiof" (deprecated)
15+
16+
When compatible with the generic version, nodes
17+
must list the SoC-specific version corresponding
18+
to the platform first followed by the generic
19+
version.
20+
1521
- reg : A list of offsets and lengths of the register sets for
1622
the device.
1723
If only one register set is present, it is to be used
@@ -61,7 +67,8 @@ Documentation/devicetree/bindings/pinctrl/renesas,*.
6167
Example:
6268

6369
msiof0: spi@e6e20000 {
64-
compatible = "renesas,msiof-r8a7791";
70+
compatible = "renesas,msiof-r8a7791",
71+
"renesas,rcar-gen2-msiof";
6572
reg = <0 0xe6e20000 0 0x0064>;
6673
interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
6774
clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>;

‎Documentation/filesystems/proc.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,11 @@ asynchronous manner and the value may not be very precise. To see a precise
212212
snapshot of a moment, you can see /proc/<pid>/smaps file and scan page table.
213213
It's slow but very precise.
214214

215-
Table 1-2: Contents of the status files (as of 4.1)
215+
Table 1-2: Contents of the status files (as of 4.8)
216216
..............................................................................
217217
Field Content
218218
Name filename of the executable
219+
Umask file mode creation mask
219220
State state (R is running, S is sleeping, D is sleeping
220221
in an uninterruptible wait, Z is zombie,
221222
T is traced or stopped)
@@ -226,7 +227,6 @@ Table 1-2: Contents of the status files (as of 4.1)
226227
TracerPid PID of process tracing this process (0 if not)
227228
Uid Real, effective, saved set, and file system UIDs
228229
Gid Real, effective, saved set, and file system GIDs
229-
Umask file mode creation mask
230230
FDSize number of file descriptor slots currently allocated
231231
Groups supplementary group list
232232
NStgid descendant namespace thread group ID hierarchy
@@ -236,6 +236,7 @@ Table 1-2: Contents of the status files (as of 4.1)
236236
VmPeak peak virtual memory size
237237
VmSize total program size
238238
VmLck locked memory size
239+
VmPin pinned memory size
239240
VmHWM peak resident set size ("high water mark")
240241
VmRSS size of memory portions. It contains the three
241242
following parts (VmRSS = RssAnon + RssFile + RssShmem)

‎Documentation/power/states.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ only one way to cause the system to go into the Suspend-To-RAM state (write
3535
The default suspend mode (ie. the one to be used without writing anything into
3636
/sys/power/mem_sleep) is either "deep" (if Suspend-To-RAM is supported) or
3737
"s2idle", but it can be overridden by the value of the "mem_sleep_default"
38-
parameter in the kernel command line. On some ACPI-based systems, depending on
39-
the information in the FADT, the default may be "s2idle" even if Suspend-To-RAM
40-
is supported.
38+
parameter in the kernel command line.
4139

4240
The properties of all of the sleep states are described below.
4341

‎MAINTAINERS

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -976,6 +976,7 @@ M: Russell King <linux@armlinux.org.uk>
976976
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
977977
W: http://www.armlinux.org.uk/
978978
S: Maintained
979+
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git
979980
F: arch/arm/
980981

981982
ARM SUB-ARCHITECTURES
@@ -1153,6 +1154,7 @@ ARM/CLKDEV SUPPORT
11531154
M: Russell King <linux@armlinux.org.uk>
11541155
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
11551156
S: Maintained
1157+
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git clkdev
11561158
F: arch/arm/include/asm/clkdev.h
11571159
F: drivers/clk/clkdev.c
11581160

@@ -1688,6 +1690,7 @@ M: Krzysztof Kozlowski <krzk@kernel.org>
16881690
R: Javier Martinez Canillas <javier@osg.samsung.com>
16891691
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
16901692
L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
1693+
Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/
16911694
S: Maintained
16921695
F: arch/arm/boot/dts/s3c*
16931696
F: arch/arm/boot/dts/s5p*
@@ -3570,7 +3573,7 @@ F: drivers/infiniband/hw/cxgb3/
35703573
F: include/uapi/rdma/cxgb3-abi.h
35713574

35723575
CXGB4 ETHERNET DRIVER (CXGB4)
3573-
M: Hariprasad S <hariprasad@chelsio.com>
3576+
M: Ganesh Goudar <ganeshgr@chelsio.com>
35743577
L: netdev@vger.kernel.org
35753578
W: http://www.chelsio.com
35763579
S: Supported
@@ -4103,12 +4106,18 @@ F: drivers/gpu/drm/bridge/
41034106

41044107
DRM DRIVER FOR BOCHS VIRTUAL GPU
41054108
M: Gerd Hoffmann <kraxel@redhat.com>
4106-
S: Odd Fixes
4109+
L: virtualization@lists.linux-foundation.org
4110+
T: git git://git.kraxel.org/linux drm-qemu
4111+
S: Maintained
41074112
F: drivers/gpu/drm/bochs/
41084113

41094114
DRM DRIVER FOR QEMU'S CIRRUS DEVICE
41104115
M: Dave Airlie <airlied@redhat.com>
4111-
S: Odd Fixes
4116+
M: Gerd Hoffmann <kraxel@redhat.com>
4117+
L: virtualization@lists.linux-foundation.org
4118+
T: git git://git.kraxel.org/linux drm-qemu
4119+
S: Obsolete
4120+
W: https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
41124121
F: drivers/gpu/drm/cirrus/
41134122

41144123
RADEON and AMDGPU DRM DRIVERS
@@ -4150,7 +4159,7 @@ F: Documentation/gpu/i915.rst
41504159
INTEL GVT-g DRIVERS (Intel GPU Virtualization)
41514160
M: Zhenyu Wang <zhenyuw@linux.intel.com>
41524161
M: Zhi Wang <zhi.a.wang@intel.com>
4153-
L: igvt-g-dev@lists.01.org
4162+
L: intel-gvt-dev@lists.freedesktop.org
41544163
L: intel-gfx@lists.freedesktop.org
41554164
W: https://01.org/igvt-g
41564165
T: git https://github.com/01org/gvt-linux.git
@@ -4301,7 +4310,10 @@ F: Documentation/devicetree/bindings/display/renesas,du.txt
43014310

43024311
DRM DRIVER FOR QXL VIRTUAL GPU
43034312
M: Dave Airlie <airlied@redhat.com>
4304-
S: Odd Fixes
4313+
M: Gerd Hoffmann <kraxel@redhat.com>
4314+
L: virtualization@lists.linux-foundation.org
4315+
T: git git://git.kraxel.org/linux drm-qemu
4316+
S: Maintained
43054317
F: drivers/gpu/drm/qxl/
43064318
F: include/uapi/drm/qxl_drm.h
43074319

@@ -7703,8 +7715,10 @@ F: drivers/net/dsa/mv88e6xxx/
77037715
F: Documentation/devicetree/bindings/net/dsa/marvell.txt
77047716

77057717
MARVELL ARMADA DRM SUPPORT
7706-
M: Russell King <rmk+kernel@armlinux.org.uk>
7718+
M: Russell King <linux@armlinux.org.uk>
77077719
S: Maintained
7720+
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-armada-devel
7721+
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-armada-fixes
77087722
F: drivers/gpu/drm/armada/
77097723
F: include/uapi/drm/armada_drm.h
77107724
F: Documentation/devicetree/bindings/display/armada/
@@ -8909,8 +8923,10 @@ S: Supported
89098923
F: drivers/nfc/nxp-nci
89108924

89118925
NXP TDA998X DRM DRIVER
8912-
M: Russell King <rmk+kernel@armlinux.org.uk>
8926+
M: Russell King <linux@armlinux.org.uk>
89138927
S: Supported
8928+
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel
8929+
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-fixes
89148930
F: drivers/gpu/drm/i2c/tda998x_drv.c
89158931
F: include/drm/i2c/tda998x.h
89168932

@@ -13105,6 +13121,7 @@ M: David Airlie <airlied@linux.ie>
1310513121
M: Gerd Hoffmann <kraxel@redhat.com>
1310613122
L: dri-devel@lists.freedesktop.org
1310713123
L: virtualization@lists.linux-foundation.org
13124+
T: git git://git.kraxel.org/linux drm-qemu
1310813125
S: Maintained
1310913126
F: drivers/gpu/drm/virtio/
1311013127
F: include/uapi/linux/virtio_gpu.h
@@ -13456,6 +13473,7 @@ F: arch/x86/
1345613473

1345713474
X86 PLATFORM DRIVERS
1345813475
M: Darren Hart <dvhart@infradead.org>
13476+
M: Andy Shevchenko <andy@infradead.org>
1345913477
L: platform-driver-x86@vger.kernel.org
1346013478
T: git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git
1346113479
S: Maintained
@@ -13627,6 +13645,7 @@ F: drivers/net/hamradio/z8530.h
1362713645

1362813646
ZBUD COMPRESSED PAGE ALLOCATOR
1362913647
M: Seth Jennings <sjenning@redhat.com>
13648+
M: Dan Streetman <ddstreet@ieee.org>
1363013649
L: linux-mm@kvack.org
1363113650
S: Maintained
1363213651
F: mm/zbud.c
@@ -13682,6 +13701,7 @@ F: Documentation/vm/zsmalloc.txt
1368213701

1368313702
ZSWAP COMPRESSED SWAP CACHING
1368413703
M: Seth Jennings <sjenning@redhat.com>
13704+
M: Dan Streetman <ddstreet@ieee.org>
1368513705
L: linux-mm@kvack.org
1368613706
S: Maintained
1368713707
F: mm/zswap.c

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
VERSION = 4
22
PATCHLEVEL = 10
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc4
5-
NAME = Roaring Lionus
4+
EXTRAVERSION = -rc5
5+
NAME = Anniversary Edition
66

77
# *DOCUMENTATION*
88
# To see a list of typical targets execute "make help"

‎arch/arc/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ config ARC
2929
select HAVE_KPROBES
3030
select HAVE_KRETPROBES
3131
select HAVE_MEMBLOCK
32-
select HAVE_MOD_ARCH_SPECIFIC if ARC_DW2_UNWIND
32+
select HAVE_MOD_ARCH_SPECIFIC
3333
select HAVE_OPROFILE
3434
select HAVE_PERF_EVENTS
3535
select HANDLE_DOMAIN_IRQ

‎arch/arc/include/asm/cache.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ extern unsigned long perip_base, perip_end;
6767
#define ARC_REG_IC_PTAG_HI 0x1F
6868

6969
/* Bit val in IC_CTRL */
70-
#define IC_CTRL_CACHE_DISABLE 0x1
70+
#define IC_CTRL_DIS 0x1
7171

7272
/* Data cache related Auxiliary registers */
7373
#define ARC_REG_DC_BCR 0x72 /* Build Config reg */
@@ -80,8 +80,9 @@ extern unsigned long perip_base, perip_end;
8080
#define ARC_REG_DC_PTAG_HI 0x5F
8181

8282
/* Bit val in DC_CTRL */
83-
#define DC_CTRL_INV_MODE_FLUSH 0x40
84-
#define DC_CTRL_FLUSH_STATUS 0x100
83+
#define DC_CTRL_DIS 0x001
84+
#define DC_CTRL_INV_MODE_FLUSH 0x040
85+
#define DC_CTRL_FLUSH_STATUS 0x100
8586

8687
/*System-level cache (L2 cache) related Auxiliary registers */
8788
#define ARC_REG_SLC_CFG 0x901
@@ -92,8 +93,8 @@ extern unsigned long perip_base, perip_end;
9293
#define ARC_REG_SLC_RGN_END 0x916
9394

9495
/* Bit val in SLC_CONTROL */
96+
#define SLC_CTRL_DIS 0x001
9597
#define SLC_CTRL_IM 0x040
96-
#define SLC_CTRL_DISABLE 0x001
9798
#define SLC_CTRL_BUSY 0x100
9899
#define SLC_CTRL_RGN_OP_INV 0x200
99100

‎arch/arc/include/asm/entry-arcv2.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
;
1717
; Now manually save: r12, sp, fp, gp, r25
1818

19+
PUSH r30
1920
PUSH r12
2021

2122
; Saving pt_regs->sp correctly requires some extra work due to the way
@@ -72,6 +73,7 @@
7273
POPAX AUX_USER_SP
7374
1:
7475
POP r12
76+
POP r30
7577

7678
.endm
7779

‎arch/arc/include/asm/module.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
#include <asm-generic/module.h>
1616

17-
#ifdef CONFIG_ARC_DW2_UNWIND
1817
struct mod_arch_specific {
18+
#ifdef CONFIG_ARC_DW2_UNWIND
1919
void *unw_info;
2020
int unw_sec_idx;
21+
#endif
2122
const char *secstr;
2223
};
23-
#endif
2424

2525
#define MODULE_PROC_FAMILY "ARC700"
2626

‎arch/arc/include/asm/ptrace.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ struct pt_regs {
8484
unsigned long fp;
8585
unsigned long sp; /* user/kernel sp depending on where we came from */
8686

87-
unsigned long r12;
87+
unsigned long r12, r30;
8888

8989
/*------- Below list auto saved by h/w -----------*/
9090
unsigned long r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11;

‎arch/arc/include/asm/setup.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ extern int root_mountflags, end_mem;
3131

3232
void setup_processor(void);
3333
void __init setup_arch_memory(void);
34+
long __init arc_get_mem_sz(void);
3435

3536
/* Helpers used in arc_*_mumbojumbo routines */
3637
#define IS_AVAIL1(v, s) ((v) ? s : "")

‎arch/arc/kernel/intc-arcv2.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,20 @@ void arc_init_IRQ(void)
7777

7878
static void arcv2_irq_mask(struct irq_data *data)
7979
{
80-
write_aux_reg(AUX_IRQ_SELECT, data->irq);
80+
write_aux_reg(AUX_IRQ_SELECT, data->hwirq);
8181
write_aux_reg(AUX_IRQ_ENABLE, 0);
8282
}
8383

8484
static void arcv2_irq_unmask(struct irq_data *data)
8585
{
86-
write_aux_reg(AUX_IRQ_SELECT, data->irq);
86+
write_aux_reg(AUX_IRQ_SELECT, data->hwirq);
8787
write_aux_reg(AUX_IRQ_ENABLE, 1);
8888
}
8989

9090
void arcv2_irq_enable(struct irq_data *data)
9191
{
9292
/* set default priority */
93-
write_aux_reg(AUX_IRQ_SELECT, data->irq);
93+
write_aux_reg(AUX_IRQ_SELECT, data->hwirq);
9494
write_aux_reg(AUX_IRQ_PRIORITY, ARCV2_IRQ_DEF_PRIO);
9595

9696
/*

‎arch/arc/kernel/intc-compact.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static void arc_irq_mask(struct irq_data *data)
5757
unsigned int ienb;
5858

5959
ienb = read_aux_reg(AUX_IENABLE);
60-
ienb &= ~(1 << data->irq);
60+
ienb &= ~(1 << data->hwirq);
6161
write_aux_reg(AUX_IENABLE, ienb);
6262
}
6363

@@ -66,7 +66,7 @@ static void arc_irq_unmask(struct irq_data *data)
6666
unsigned int ienb;
6767

6868
ienb = read_aux_reg(AUX_IENABLE);
69-
ienb |= (1 << data->irq);
69+
ienb |= (1 << data->hwirq);
7070
write_aux_reg(AUX_IENABLE, ienb);
7171
}
7272

‎arch/arc/kernel/mcip.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <linux/smp.h>
1212
#include <linux/irq.h>
13+
#include <linux/irqchip/chained_irq.h>
1314
#include <linux/spinlock.h>
1415
#include <soc/arc/mcip.h>
1516
#include <asm/irqflags-arcv2.h>
@@ -221,10 +222,13 @@ static irq_hw_number_t idu_first_hwirq;
221222
static void idu_cascade_isr(struct irq_desc *desc)
222223
{
223224
struct irq_domain *idu_domain = irq_desc_get_handler_data(desc);
225+
struct irq_chip *core_chip = irq_desc_get_chip(desc);
224226
irq_hw_number_t core_hwirq = irqd_to_hwirq(irq_desc_get_irq_data(desc));
225227
irq_hw_number_t idu_hwirq = core_hwirq - idu_first_hwirq;
226228

229+
chained_irq_enter(core_chip, desc);
227230
generic_handle_irq(irq_find_mapping(idu_domain, idu_hwirq));
231+
chained_irq_exit(core_chip, desc);
228232
}
229233

230234
static int idu_irq_map(struct irq_domain *d, unsigned int virq, irq_hw_number_t hwirq)

0 commit comments

Comments
 (0)