Skip to content

Commit 0f3e9c9

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All of the conflicts were cases of overlapping changes. In net/core/devlink.c, we have to make care that the resouce size_params have become a struct member rather than a pointer to such an object. Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents ef3f6c2 + ce38061 commit 0f3e9c9

File tree

484 files changed

+4721
-2550
lines changed

Some content is hidden

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

484 files changed

+4721
-2550
lines changed

‎Documentation/PCI/pci.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,9 @@ your driver if they're helpful, or just use plain hex constants.
570570
The device IDs are arbitrary hex numbers (vendor controlled) and normally used
571571
only in a single location, the pci_device_id table.
572572

573-
Please DO submit new vendor/device IDs to http://pciids.sourceforge.net/.
573+
Please DO submit new vendor/device IDs to http://pci-ids.ucw.cz/.
574+
There are mirrors of the pci.ids file at http://pciids.sourceforge.net/
575+
and https://github.com/pciutils/pciids.
574576

575577

576578

‎Documentation/devicetree/bindings/misc/arm-charlcd.txt renamed to ‎Documentation/devicetree/bindings/auxdisplay/arm-charlcd.txt

File renamed without changes.

‎Documentation/devicetree/bindings/eeprom/at24.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ Required properties:
3838

3939
"catalyst",
4040
"microchip",
41+
"nxp",
4142
"ramtron",
4243
"renesas",
43-
"nxp",
4444
"st",
4545

4646
Some vendors use different model names for chips which are just

‎Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Required properties:
1414
- "renesas,irqc-r8a7794" (R-Car E2)
1515
- "renesas,intc-ex-r8a7795" (R-Car H3)
1616
- "renesas,intc-ex-r8a7796" (R-Car M3-W)
17+
- "renesas,intc-ex-r8a77965" (R-Car M3-N)
1718
- "renesas,intc-ex-r8a77970" (R-Car V3M)
1819
- "renesas,intc-ex-r8a77995" (R-Car D3)
1920
- #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in

‎Documentation/devicetree/bindings/net/renesas,ravb.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Required properties:
1818
- "renesas,etheravb-r8a7795" for the R8A7795 SoC.
1919
- "renesas,etheravb-r8a7796" for the R8A7796 SoC.
2020
- "renesas,etheravb-r8a77970" for the R8A77970 SoC.
21+
- "renesas,etheravb-r8a77980" for the R8A77980 SoC.
2122
- "renesas,etheravb-r8a77995" for the R8A77995 SoC.
2223
- "renesas,etheravb-rcar-gen3" as a fallback for the above
2324
R-Car Gen3 devices.

‎Documentation/devicetree/bindings/power/wakeup-source.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Examples
6060
#size-cells = <0>;
6161

6262
button@1 {
63-
debounce_interval = <50>;
63+
debounce-interval = <50>;
6464
wakeup-source;
6565
linux,code = <116>;
6666
label = "POWER";

‎Documentation/devicetree/bindings/thermal/imx-thermal.txt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,32 @@ Optional properties:
2222
- clocks : thermal sensor's clock source.
2323

2424
Example:
25+
ocotp: ocotp@21bc000 {
26+
#address-cells = <1>;
27+
#size-cells = <1>;
28+
compatible = "fsl,imx6sx-ocotp", "syscon";
29+
reg = <0x021bc000 0x4000>;
30+
clocks = <&clks IMX6SX_CLK_OCOTP>;
2531

32+
tempmon_calib: calib@38 {
33+
reg = <0x38 4>;
34+
};
35+
36+
tempmon_temp_grade: temp-grade@20 {
37+
reg = <0x20 4>;
38+
};
39+
};
40+
41+
tempmon: tempmon {
42+
compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon";
43+
interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
44+
fsl,tempmon = <&anatop>;
45+
nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
46+
nvmem-cell-names = "calib", "temp_grade";
47+
clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;
48+
};
49+
50+
Legacy method (Deprecated):
2651
tempmon {
2752
compatible = "fsl,imx6q-tempmon";
2853
fsl,tempmon = <&anatop>;

‎Documentation/ia64/serial.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ TROUBLESHOOTING SERIAL CONSOLE PROBLEMS
111111

112112
- If you don't have an HCDP, the kernel doesn't know where
113113
your console lives until the driver discovers serial
114-
devices. Use "console=uart, io,0x3f8" (or appropriate
114+
devices. Use "console=uart,io,0x3f8" (or appropriate
115115
address for your machine).
116116

117117
Kernel and init script output works fine, but no "login:" prompt:

‎Documentation/media/dmx.h.rst.exceptions

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,15 @@ replace typedef dmx_filter_t :c:type:`dmx_filter`
5050
replace typedef dmx_pes_type_t :c:type:`dmx_pes_type`
5151
replace typedef dmx_input_t :c:type:`dmx_input`
5252

53-
ignore symbol DMX_OUT_DECODER
54-
ignore symbol DMX_OUT_TAP
55-
ignore symbol DMX_OUT_TS_TAP
56-
ignore symbol DMX_OUT_TSDEMUX_TAP
53+
replace symbol DMX_BUFFER_FLAG_HAD_CRC32_DISCARD :c:type:`dmx_buffer_flags`
54+
replace symbol DMX_BUFFER_FLAG_TEI :c:type:`dmx_buffer_flags`
55+
replace symbol DMX_BUFFER_PKT_COUNTER_MISMATCH :c:type:`dmx_buffer_flags`
56+
replace symbol DMX_BUFFER_FLAG_DISCONTINUITY_DETECTED :c:type:`dmx_buffer_flags`
57+
replace symbol DMX_BUFFER_FLAG_DISCONTINUITY_INDICATOR :c:type:`dmx_buffer_flags`
58+
59+
replace symbol DMX_OUT_DECODER :c:type:`dmx_output`
60+
replace symbol DMX_OUT_TAP :c:type:`dmx_output`
61+
replace symbol DMX_OUT_TS_TAP :c:type:`dmx_output`
62+
replace symbol DMX_OUT_TSDEMUX_TAP :c:type:`dmx_output`
5763

5864
replace ioctl DMX_DQBUF dmx_qbuf

‎Documentation/media/uapi/dvb/dmx-qbuf.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ out to disk. Buffers remain locked until dequeued, until the
5151
the device is closed.
5252
5353
Applications call the ``DMX_DQBUF`` ioctl to dequeue a filled
54-
(capturing) buffer from the driver's outgoing queue. They just set the ``reserved`` field array to zero. When ``DMX_DQBUF`` is called with a
55-
pointer to this structure, the driver fills the remaining fields or
56-
returns an error code.
54+
(capturing) buffer from the driver's outgoing queue.
55+
They just set the ``index`` field withe the buffer ID to be queued.
56+
When ``DMX_DQBUF`` is called with a pointer to struct :c:type:`dmx_buffer`,
57+
the driver fills the remaining fields or returns an error code.
5758
5859
By default ``DMX_DQBUF`` blocks when no buffer is in the outgoing
5960
queue. When the ``O_NONBLOCK`` flag was given to the

‎Documentation/virtual/kvm/api.txt

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,15 @@ memory layout to fit in user mode), check KVM_CAP_MIPS_VZ and use the
123123
flag KVM_VM_MIPS_VZ.
124124

125125

126-
4.3 KVM_GET_MSR_INDEX_LIST
126+
4.3 KVM_GET_MSR_INDEX_LIST, KVM_GET_MSR_FEATURE_INDEX_LIST
127127

128-
Capability: basic
128+
Capability: basic, KVM_CAP_GET_MSR_FEATURES for KVM_GET_MSR_FEATURE_INDEX_LIST
129129
Architectures: x86
130-
Type: system
130+
Type: system ioctl
131131
Parameters: struct kvm_msr_list (in/out)
132132
Returns: 0 on success; -1 on error
133133
Errors:
134+
EFAULT: the msr index list cannot be read from or written to
134135
E2BIG: the msr index list is to be to fit in the array specified by
135136
the user.
136137

@@ -139,16 +140,23 @@ struct kvm_msr_list {
139140
__u32 indices[0];
140141
};
141142

142-
This ioctl returns the guest msrs that are supported. The list varies
143-
by kvm version and host processor, but does not change otherwise. The
144-
user fills in the size of the indices array in nmsrs, and in return
145-
kvm adjusts nmsrs to reflect the actual number of msrs and fills in
146-
the indices array with their numbers.
143+
The user fills in the size of the indices array in nmsrs, and in return
144+
kvm adjusts nmsrs to reflect the actual number of msrs and fills in the
145+
indices array with their numbers.
146+
147+
KVM_GET_MSR_INDEX_LIST returns the guest msrs that are supported. The list
148+
varies by kvm version and host processor, but does not change otherwise.
147149

148150
Note: if kvm indicates supports MCE (KVM_CAP_MCE), then the MCE bank MSRs are
149151
not returned in the MSR list, as different vcpus can have a different number
150152
of banks, as set via the KVM_X86_SETUP_MCE ioctl.
151153

154+
KVM_GET_MSR_FEATURE_INDEX_LIST returns the list of MSRs that can be passed
155+
to the KVM_GET_MSRS system ioctl. This lets userspace probe host capabilities
156+
and processor features that are exposed via MSRs (e.g., VMX capabilities).
157+
This list also varies by kvm version and host processor, but does not change
158+
otherwise.
159+
152160

153161
4.4 KVM_CHECK_EXTENSION
154162

@@ -475,14 +483,22 @@ Support for this has been removed. Use KVM_SET_GUEST_DEBUG instead.
475483

476484
4.18 KVM_GET_MSRS
477485

478-
Capability: basic
486+
Capability: basic (vcpu), KVM_CAP_GET_MSR_FEATURES (system)
479487
Architectures: x86
480-
Type: vcpu ioctl
488+
Type: system ioctl, vcpu ioctl
481489
Parameters: struct kvm_msrs (in/out)
482-
Returns: 0 on success, -1 on error
490+
Returns: number of msrs successfully returned;
491+
-1 on error
492+
493+
When used as a system ioctl:
494+
Reads the values of MSR-based features that are available for the VM. This
495+
is similar to KVM_GET_SUPPORTED_CPUID, but it returns MSR indices and values.
496+
The list of msr-based features can be obtained using KVM_GET_MSR_FEATURE_INDEX_LIST
497+
in a system ioctl.
483498

499+
When used as a vcpu ioctl:
484500
Reads model-specific registers from the vcpu. Supported msr indices can
485-
be obtained using KVM_GET_MSR_INDEX_LIST.
501+
be obtained using KVM_GET_MSR_INDEX_LIST in a system ioctl.
486502

487503
struct kvm_msrs {
488504
__u32 nmsrs; /* number of msrs in entries */

‎Documentation/virtual/kvm/cpuid.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ KVM_FEATURE_PV_TLB_FLUSH || 9 || guest checks this feature bit
5858
|| || before enabling paravirtualized
5959
|| || tlb flush.
6060
------------------------------------------------------------------------------
61+
KVM_FEATURE_ASYNC_PF_VMEXIT || 10 || paravirtualized async PF VM exit
62+
|| || can be enabled by setting bit 2
63+
|| || when writing to msr 0x4b564d02
64+
------------------------------------------------------------------------------
6165
KVM_FEATURE_CLOCKSOURCE_STABLE_BIT || 24 || host will warn if no guest-side
6266
|| || per-cpu warps are expected in
6367
|| || kvmclock.

‎Documentation/virtual/kvm/msr.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ MSR_KVM_ASYNC_PF_EN: 0x4b564d02
170170
when asynchronous page faults are enabled on the vcpu 0 when
171171
disabled. Bit 1 is 1 if asynchronous page faults can be injected
172172
when vcpu is in cpl == 0. Bit 2 is 1 if asynchronous page faults
173-
are delivered to L1 as #PF vmexits.
173+
are delivered to L1 as #PF vmexits. Bit 2 can be set only if
174+
KVM_FEATURE_ASYNC_PF_VMEXIT is present in CPUID.
174175

175176
First 4 byte of 64 byte memory location will be written to by
176177
the hypervisor at the time of asynchronous page fault (APF)

‎Documentation/x86/intel_rdt_ui.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ occupancy of the real time threads on these cores.
671671
# mkdir p1
672672

673673
Move the cpus 4-7 over to p1
674-
# echo f0 > p0/cpus
674+
# echo f0 > p1/cpus
675675

676676
View the llc occupancy snapshot
677677

‎Documentation/x86/topology.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ The topology of a system is described in the units of:
108108

109109
The number of online threads is also printed in /proc/cpuinfo "siblings."
110110

111-
- topology_sibling_mask():
111+
- topology_sibling_cpumask():
112112

113113
The cpumask contains all online threads in the core to which a thread
114114
belongs.

‎MAINTAINERS

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,7 +1238,7 @@ F: drivers/clk/at91
12381238

12391239
ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
12401240
M: Nicolas Ferre <nicolas.ferre@microchip.com>
1241-
M: Alexandre Belloni <alexandre.belloni@free-electrons.com>
1241+
M: Alexandre Belloni <alexandre.belloni@bootlin.com>
12421242
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
12431243
W: http://www.linux4sam.org
12441244
T: git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
@@ -1590,7 +1590,7 @@ ARM/Marvell Dove/MV78xx0/Orion SOC support
15901590
M: Jason Cooper <jason@lakedaemon.net>
15911591
M: Andrew Lunn <andrew@lunn.ch>
15921592
M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
1593-
M: Gregory Clement <gregory.clement@free-electrons.com>
1593+
M: Gregory Clement <gregory.clement@bootlin.com>
15941594
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
15951595
S: Maintained
15961596
F: Documentation/devicetree/bindings/soc/dove/
@@ -1604,7 +1604,7 @@ F: arch/arm/boot/dts/orion5x*
16041604
ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
16051605
M: Jason Cooper <jason@lakedaemon.net>
16061606
M: Andrew Lunn <andrew@lunn.ch>
1607-
M: Gregory Clement <gregory.clement@free-electrons.com>
1607+
M: Gregory Clement <gregory.clement@bootlin.com>
16081608
M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
16091609
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
16101610
S: Maintained
@@ -1999,8 +1999,10 @@ M: Maxime Coquelin <mcoquelin.stm32@gmail.com>
19991999
M: Alexandre Torgue <alexandre.torgue@st.com>
20002000
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
20012001
S: Maintained
2002-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git
2002+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
20032003
N: stm32
2004+
F: arch/arm/boot/dts/stm32*
2005+
F: arch/arm/mach-stm32/
20042006
F: drivers/clocksource/armv7m_systick.c
20052007

20062008
ARM/TANGO ARCHITECTURE
@@ -7600,8 +7602,10 @@ F: mm/kasan/
76007602
F: scripts/Makefile.kasan
76017603

76027604
KCONFIG
7605+
M: Masahiro Yamada <yamada.masahiro@socionext.com>
7606+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig
76037607
L: linux-kbuild@vger.kernel.org
7604-
S: Orphan
7608+
S: Maintained
76057609
F: Documentation/kbuild/kconfig-language.txt
76067610
F: scripts/kconfig/
76077611

@@ -10935,6 +10939,17 @@ L: linux-gpio@vger.kernel.org
1093510939
S: Supported
1093610940
F: drivers/pinctrl/pinctrl-at91-pio4.*
1093710941

10942+
PIN CONTROLLER - FREESCALE
10943+
M: Dong Aisheng <aisheng.dong@nxp.com>
10944+
M: Fabio Estevam <festevam@gmail.com>
10945+
M: Shawn Guo <shawnguo@kernel.org>
10946+
M: Stefan Agner <stefan@agner.ch>
10947+
R: Pengutronix Kernel Team <kernel@pengutronix.de>
10948+
L: linux-gpio@vger.kernel.org
10949+
S: Maintained
10950+
F: drivers/pinctrl/freescale/
10951+
F: Documentation/devicetree/bindings/pinctrl/fsl,*
10952+
1093810953
PIN CONTROLLER - INTEL
1093910954
M: Mika Westerberg <mika.westerberg@linux.intel.com>
1094010955
M: Heikki Krogerus <heikki.krogerus@linux.intel.com>

‎Makefile

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 4
33
PATCHLEVEL = 16
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc2
5+
EXTRAVERSION = -rc4
66
NAME = Fearless Coyote
77

88
# *DOCUMENTATION*
@@ -388,7 +388,7 @@ PYTHON = python
388388
CHECK = sparse
389389

390390
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
391-
-Wbitwise -Wno-return-void $(CF)
391+
-Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)
392392
NOSTDINC_FLAGS =
393393
CFLAGS_MODULE =
394394
AFLAGS_MODULE =
@@ -489,6 +489,11 @@ KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
489489
KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
490490
endif
491491

492+
RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
493+
RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk
494+
RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))
495+
export RETPOLINE_CFLAGS
496+
492497
ifeq ($(config-targets),1)
493498
# ===========================================================================
494499
# *config targets only - make sure prerequisites are updated, and descend
@@ -579,10 +584,9 @@ ifeq ($(KBUILD_EXTMOD),)
579584
# To avoid any implicit rule to kick in, define an empty command
580585
$(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;
581586

582-
# If .config is newer than include/config/auto.conf, someone tinkered
583-
# with it and forgot to run make oldconfig.
584-
# if auto.conf.cmd is missing then we are probably in a cleaned tree so
585-
# we execute the config step to be sure to catch updated Kconfig files
587+
# The actual configuration files used during the build are stored in
588+
# include/generated/ and include/config/. Update them if .config is newer than
589+
# include/config/auto.conf (which mirrors .config).
586590
include/config/%.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd
587591
$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
588592
else
@@ -857,8 +861,7 @@ KBUILD_AFLAGS += $(ARCH_AFLAGS) $(KAFLAGS)
857861
KBUILD_CFLAGS += $(ARCH_CFLAGS) $(KCFLAGS)
858862

859863
# Use --build-id when available.
860-
LDFLAGS_BUILD_ID := $(patsubst -Wl$(comma)%,%,\
861-
$(call cc-ldoption, -Wl$(comma)--build-id,))
864+
LDFLAGS_BUILD_ID := $(call ld-option, --build-id)
862865
KBUILD_LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID)
863866
LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID)
864867

‎arch/alpha/include/asm/cmpxchg.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* Atomic exchange routines.
77
*/
88

9-
#define __ASM__MB
109
#define ____xchg(type, args...) __xchg ## type ## _local(args)
1110
#define ____cmpxchg(type, args...) __cmpxchg ## type ## _local(args)
1211
#include <asm/xchg.h>
@@ -33,10 +32,6 @@
3332
cmpxchg_local((ptr), (o), (n)); \
3433
})
3534

36-
#ifdef CONFIG_SMP
37-
#undef __ASM__MB
38-
#define __ASM__MB "\tmb\n"
39-
#endif
4035
#undef ____xchg
4136
#undef ____cmpxchg
4237
#define ____xchg(type, args...) __xchg ##type(args)
@@ -64,7 +59,6 @@
6459
cmpxchg((ptr), (o), (n)); \
6560
})
6661

67-
#undef __ASM__MB
6862
#undef ____cmpxchg
6963

7064
#endif /* _ALPHA_CMPXCHG_H */

0 commit comments

Comments
 (0)