Skip to content

Commit 76ed626

Browse files
kuba-mookuba-moo
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/phy/aquantia/aquantia.h 2193437 ("net: phy: aquantia: add missing include guards") 61578f6 ("net: phy: aquantia: add support for PHY LEDs") drivers/net/ethernet/wangxun/libwx/wx_hw.c bd07a98 ("net: txgbe: remove separate irq request for MSI and INTx") b501d26 ("net: txgbe: add FDIR ATR support") https://lore.kernel.org/all/[email protected]/ include/linux/mlx5/mlx5_ifc.h 048a403 ("net/mlx5: IFC updates for changing max EQs") 99be561 ("net/mlx5e: SHAMPO, Re-enable HW-GRO") https://lore.kernel.org/all/[email protected]/ Adjacent changes: drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 4130c67 ("wifi: iwlwifi: mvm: check vif for NULL/ERR_PTR before dereference") 3f31265 ("wifi: iwlwifi: mvm: add mvm-specific guard") include/net/mac80211.h 816c6be ("wifi: mac80211: fix BSS_CHANGED_UNSOL_BCAST_PROBE_RESP") 5a009b4 ("wifi: mac80211: track changes in AP's TPE") Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 7829b37 + 033771c commit 76ed626

File tree

348 files changed

+3062
-2231
lines changed

Some content is hidden

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

348 files changed

+3062
-2231
lines changed

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -788,25 +788,6 @@
788788
Documentation/networking/netconsole.rst for an
789789
alternative.
790790

791-
<DEVNAME>:<n>.<n>[,options]
792-
Use the specified serial port on the serial core bus.
793-
The addressing uses DEVNAME of the physical serial port
794-
device, followed by the serial core controller instance,
795-
and the serial port instance. The options are the same
796-
as documented for the ttyS addressing above.
797-
798-
The mapping of the serial ports to the tty instances
799-
can be viewed with:
800-
801-
$ ls -d /sys/bus/serial-base/devices/*:*.*/tty/*
802-
/sys/bus/serial-base/devices/00:04:0.0/tty/ttyS0
803-
804-
In the above example, the console can be addressed with
805-
console=00:04:0.0. Note that a console addressed this
806-
way will only get added when the related device driver
807-
is ready. The use of an earlycon parameter in addition to
808-
the console may be desired for console output early on.
809-
810791
uart[8250],io,<addr>[,options]
811792
uart[8250],mmio,<addr>[,options]
812793
uart[8250],mmio16,<addr>[,options]

‎Documentation/driver-api/cxl/memory-devices.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,12 @@ CXL Memory Device
328328
.. kernel-doc:: drivers/cxl/mem.c
329329
:doc: cxl mem
330330

331+
.. kernel-doc:: drivers/cxl/cxlmem.h
332+
:internal:
333+
334+
.. kernel-doc:: drivers/cxl/core/memdev.c
335+
:identifiers:
336+
331337
CXL Port
332338
--------
333339
.. kernel-doc:: drivers/cxl/port.c
@@ -341,6 +347,15 @@ CXL Core
341347
.. kernel-doc:: drivers/cxl/cxl.h
342348
:internal:
343349

350+
.. kernel-doc:: drivers/cxl/core/hdm.c
351+
:doc: cxl core hdm
352+
353+
.. kernel-doc:: drivers/cxl/core/hdm.c
354+
:identifiers:
355+
356+
.. kernel-doc:: drivers/cxl/core/cdat.c
357+
:identifiers:
358+
344359
.. kernel-doc:: drivers/cxl/core/port.c
345360
:doc: cxl core
346361

‎Documentation/kbuild/modules.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ executed to make module versioning work.
128128

129129
modules_install
130130
Install the external module(s). The default location is
131-
/lib/modules/<kernel_release>/extra/, but a prefix may
131+
/lib/modules/<kernel_release>/updates/, but a prefix may
132132
be added with INSTALL_MOD_PATH (discussed in section 5).
133133

134134
clean
@@ -417,7 +417,7 @@ directory:
417417

418418
And external modules are installed in:
419419

420-
/lib/modules/$(KERNELRELEASE)/extra/
420+
/lib/modules/$(KERNELRELEASE)/updates/
421421

422422
5.1 INSTALL_MOD_PATH
423423
--------------------
@@ -438,10 +438,10 @@ And external modules are installed in:
438438
-------------------
439439

440440
External modules are by default installed to a directory under
441-
/lib/modules/$(KERNELRELEASE)/extra/, but you may wish to
441+
/lib/modules/$(KERNELRELEASE)/updates/, but you may wish to
442442
locate modules for a specific functionality in a separate
443443
directory. For this purpose, use INSTALL_MOD_DIR to specify an
444-
alternative name to "extra."::
444+
alternative name to "updates."::
445445

446446
$ make INSTALL_MOD_DIR=gandalf -C $KDIR \
447447
M=$PWD modules_install

‎Documentation/userspace-api/ioctl/ioctl-number.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ Code Seq# Include File Comments
186186
'Q' all linux/soundcard.h
187187
'R' 00-1F linux/random.h conflict!
188188
'R' 01 linux/rfkill.h conflict!
189+
'R' 20-2F linux/trace_mmap.h
189190
'R' C0-DF net/bluetooth/rfcomm.h
190191
'R' E0 uapi/linux/fsl_mc.h
191192
'S' all linux/cdrom.h conflict!

‎MAINTAINERS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,7 @@ M: Joerg Roedel <[email protected]>
10441044
R: Suravee Suthikulpanit <[email protected]>
10451045
L: [email protected]
10461046
S: Maintained
1047-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
1047+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
10481048
F: drivers/iommu/amd/
10491049
F: include/linux/amd-iommu.h
10501050

@@ -11157,7 +11157,7 @@ M: David Woodhouse <[email protected]>
1115711157
M: Lu Baolu <[email protected]>
1115811158
L: [email protected]
1115911159
S: Supported
11160-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
11160+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
1116111161
F: drivers/iommu/intel/
1116211162

1116311163
INTEL IPU3 CSI-2 CIO2 DRIVER
@@ -11530,7 +11530,7 @@ IOMMU DMA-API LAYER
1153011530
M: Robin Murphy <[email protected]>
1153111531
L: [email protected]
1153211532
S: Maintained
11533-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
11533+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
1153411534
F: drivers/iommu/dma-iommu.c
1153511535
F: drivers/iommu/dma-iommu.h
1153611536
F: drivers/iommu/iova.c
@@ -11542,7 +11542,7 @@ M: Will Deacon <[email protected]>
1154211542
R: Robin Murphy <[email protected]>
1154311543
L: [email protected]
1154411544
S: Maintained
11545-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
11545+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
1154611546
F: Documentation/devicetree/bindings/iommu/
1154711547
F: Documentation/userspace-api/iommu.rst
1154811548
F: drivers/iommu/
@@ -19324,7 +19324,7 @@ F: drivers/perf/riscv_pmu_legacy.c
1932419324
F: drivers/perf/riscv_pmu_sbi.c
1932519325

1932619326
RISC-V THEAD SoC SUPPORT
19327-
M: Jisheng Zhang <[email protected]>
19327+
M: Drew Fustini <[email protected]>
1932819328
M: Guo Ren <[email protected]>
1932919329
M: Fu Wei <[email protected]>
1933019330
L: [email protected]

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 10
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc5
5+
EXTRAVERSION = -rc6
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*

‎arch/arm/boot/dts/rockchip/rk3066a.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
pinctrl-0 = <&hdmii2c_xfer>, <&hdmi_hpd>;
129129
power-domains = <&power RK3066_PD_VIO>;
130130
rockchip,grf = <&grf>;
131+
#sound-dai-cells = <0>;
131132
status = "disabled";
132133

133134
ports {

‎arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66

77
/dts-v1/;
8+
9+
#include <dt-bindings/leds/common.h>
810
#include "rk3308.dtsi"
911

1012
/ {
@@ -24,17 +26,21 @@
2426
leds {
2527
compatible = "gpio-leds";
2628
pinctrl-names = "default";
27-
pinctrl-0 = <&green_led_gio>, <&heartbeat_led_gpio>;
29+
pinctrl-0 = <&green_led>, <&heartbeat_led>;
2830

2931
green-led {
32+
color = <LED_COLOR_ID_GREEN>;
3033
default-state = "on";
34+
function = LED_FUNCTION_POWER;
3135
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
3236
label = "rockpis:green:power";
3337
linux,default-trigger = "default-on";
3438
};
3539

3640
blue-led {
41+
color = <LED_COLOR_ID_BLUE>;
3742
default-state = "on";
43+
function = LED_FUNCTION_HEARTBEAT;
3844
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
3945
label = "rockpis:blue:user";
4046
linux,default-trigger = "heartbeat";
@@ -126,10 +132,12 @@
126132
};
127133

128134
&emmc {
129-
bus-width = <4>;
130135
cap-mmc-highspeed;
131-
mmc-hs200-1_8v;
136+
cap-sd-highspeed;
137+
no-sdio;
132138
non-removable;
139+
pinctrl-names = "default";
140+
pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>;
133141
vmmc-supply = <&vcc_io>;
134142
status = "okay";
135143
};
@@ -214,11 +222,11 @@
214222
pinctrl-0 = <&rtc_32k>;
215223

216224
leds {
217-
green_led_gio: green-led-gpio {
225+
green_led: green-led {
218226
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
219227
};
220228

221-
heartbeat_led_gpio: heartbeat-led-gpio {
229+
heartbeat_led: heartbeat-led {
222230
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
223231
};
224232
};

‎arch/arm64/boot/dts/rockchip/rk3308.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@
811811
clocks = <&cru SCLK_I2S2_8CH_TX_OUT>,
812812
<&cru SCLK_I2S2_8CH_RX_OUT>,
813813
<&cru PCLK_ACODEC>;
814-
reset-names = "codec-reset";
814+
reset-names = "codec";
815815
resets = <&cru SRST_ACODEC_P>;
816816
#sound-dai-cells = <0>;
817817
status = "disabled";

‎arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@
241241
rk805: pmic@18 {
242242
compatible = "rockchip,rk805";
243243
reg = <0x18>;
244-
interrupt-parent = <&gpio2>;
245-
interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
244+
interrupt-parent = <&gpio0>;
245+
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
246246
#clock-cells = <1>;
247247
clock-output-names = "xin32k", "rk805-clkout2";
248248
gpio-controller;

0 commit comments

Comments
 (0)