Skip to content

Commit 8922bb6

Browse files
committed
Merge tag 'socfpga_fix_for_v5.16_part_3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes
SoCFPGA dts updates for v5.16, part 3 - Change the SoCFPGA compatible to "intel,socfpga-qspi" - Update dt-bindings document to include "intel,socfpga-qspi" * tag 'socfpga_fix_for_v5.16_part_3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: (361 commits) ARM: dts: socfpga: change qspi to "intel,socfpga-qspi" dt-bindings: spi: cadence-quadspi: document "intel,socfpga-qspi" Linux 5.16-rc7 mm/hwpoison: clear MF_COUNT_INCREASED before retrying get_any_page() mm/damon/dbgfs: protect targets destructions with kdamond_lock mm/page_alloc: fix __alloc_size attribute for alloc_pages_exact_nid mm: delete unsafe BUG from page_cache_add_speculative() mm, hwpoison: fix condition in free hugetlb page path MAINTAINERS: mark more list instances as moderated kernel/crash_core: suppress unknown crashkernel parameter warning mm: mempolicy: fix THP allocations escaping mempolicy restrictions kfence: fix memory leak when cat kfence objects platform/x86: intel_pmc_core: fix memleak on registration failure net: stmmac: dwmac-visconti: Fix value of ETHER_CLK_SEL_FREQ_SEL_2P5M r8152: sync ocp base r8152: fix the force speed doesn't work for RTL8156 net: bridge: fix ioctl old_deviceless bridge argument net: stmmac: ptp: fix potentially overflowing expression net: dsa: tag_ocelot: use traffic class to map priority on injected header veth: ensure skb entering GRO are not cloned. ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents fde9ec3 + 36de991 commit 8922bb6

File tree

372 files changed

+3225
-1349
lines changed

Some content is hidden

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

372 files changed

+3225
-1349
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,6 +1689,8 @@
16891689
architectures force reset to be always executed
16901690
i8042.unlock [HW] Unlock (ignore) the keylock
16911691
i8042.kbdreset [HW] Reset device connected to KBD port
1692+
i8042.probe_defer
1693+
[HW] Allow deferred probing upon i8042 probe errors
16921694

16931695
i810= [HW,DRM]
16941696

@@ -2413,8 +2415,12 @@
24132415
Default is 1 (enabled)
24142416

24152417
kvm-intel.emulate_invalid_guest_state=
2416-
[KVM,Intel] Enable emulation of invalid guest states
2417-
Default is 0 (disabled)
2418+
[KVM,Intel] Disable emulation of invalid guest state.
2419+
Ignored if kvm-intel.enable_unrestricted_guest=1, as
2420+
guest state is never invalid for unrestricted guests.
2421+
This param doesn't apply to nested guests (L2), as KVM
2422+
never emulates invalid L2 guest state.
2423+
Default is 1 (enabled)
24182424

24192425
kvm-intel.flexpriority=
24202426
[KVM,Intel] Disable FlexPriority feature (TPR shadow).

Documentation/devicetree/bindings/i2c/apple,i2c.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ allOf:
2020

2121
properties:
2222
compatible:
23-
enum:
24-
- apple,t8103-i2c
25-
- apple,i2c
23+
items:
24+
- const: apple,t8103-i2c
25+
- const: apple,i2c
2626

2727
reg:
2828
maxItems: 1
@@ -51,7 +51,7 @@ unevaluatedProperties: false
5151
examples:
5252
- |
5353
i2c@35010000 {
54-
compatible = "apple,t8103-i2c";
54+
compatible = "apple,t8103-i2c", "apple,i2c";
5555
reg = <0x35010000 0x4000>;
5656
interrupt-parent = <&aic>;
5757
interrupts = <0 627 4>;

Documentation/devicetree/bindings/regulator/samsung,s5m8767.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,19 @@ patternProperties:
5151
description:
5252
Properties for single BUCK regulator.
5353

54+
properties:
55+
op_mode:
56+
$ref: /schemas/types.yaml#/definitions/uint32
57+
enum: [0, 1, 2, 3]
58+
default: 1
59+
description: |
60+
Describes the different operating modes of the regulator with power
61+
mode change in SOC. The different possible values are:
62+
0 - always off mode
63+
1 - on in normal mode
64+
2 - low power mode
65+
3 - suspend mode
66+
5467
required:
5568
- regulator-name
5669

@@ -63,6 +76,18 @@ patternProperties:
6376
Properties for single BUCK regulator.
6477

6578
properties:
79+
op_mode:
80+
$ref: /schemas/types.yaml#/definitions/uint32
81+
enum: [0, 1, 2, 3]
82+
default: 1
83+
description: |
84+
Describes the different operating modes of the regulator with power
85+
mode change in SOC. The different possible values are:
86+
0 - always off mode
87+
1 - on in normal mode
88+
2 - low power mode
89+
3 - suspend mode
90+
6691
s5m8767,pmic-ext-control-gpios:
6792
maxItems: 1
6893
description: |

Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ properties:
2929
- ti,am654-ospi
3030
- intel,lgm-qspi
3131
- xlnx,versal-ospi-1.0
32+
- intel,socfpga-qspi
3233
- const: cdns,qspi-nor
3334
- const: cdns,qspi-nor
3435

Documentation/networking/bonding.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,12 @@ ad_actor_sys_prio
196196
ad_actor_system
197197

198198
In an AD system, this specifies the mac-address for the actor in
199-
protocol packet exchanges (LACPDUs). The value cannot be NULL or
200-
multicast. It is preferred to have the local-admin bit set for this
201-
mac but driver does not enforce it. If the value is not given then
202-
system defaults to using the masters' mac address as actors' system
203-
address.
199+
protocol packet exchanges (LACPDUs). The value cannot be a multicast
200+
address. If the all-zeroes MAC is specified, bonding will internally
201+
use the MAC of the bond itself. It is preferred to have the
202+
local-admin bit set for this mac but driver does not enforce it. If
203+
the value is not given then system defaults to using the masters'
204+
mac address as actors' system address.
204205

205206
This parameter has effect only in 802.3ad mode and is available through
206207
SysFs interface.

Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ PHY and allows physical transmission and reception of Ethernet frames.
183183
IRQ config, enable, reset
184184

185185
DPNI (Datapath Network Interface)
186+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
186187
Contains TX/RX queues, network interface configuration, and RX buffer pool
187188
configuration mechanisms. The TX/RX queues are in memory and are identified
188189
by queue number.

Documentation/networking/device_drivers/ethernet/intel/ixgbe.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,22 @@ NOTE: For 82599-based network connections, if you are enabling jumbo frames in
440440
a virtual function (VF), jumbo frames must first be enabled in the physical
441441
function (PF). The VF MTU setting cannot be larger than the PF MTU.
442442

443+
NBASE-T Support
444+
---------------
445+
The ixgbe driver supports NBASE-T on some devices. However, the advertisement
446+
of NBASE-T speeds is suppressed by default, to accommodate broken network
447+
switches which cannot cope with advertised NBASE-T speeds. Use the ethtool
448+
command to enable advertising NBASE-T speeds on devices which support it::
449+
450+
ethtool -s eth? advertise 0x1800000001028
451+
452+
On Linux systems with INTERFACES(5), this can be specified as a pre-up command
453+
in /etc/network/interfaces so that the interface is always brought up with
454+
NBASE-T support, e.g.::
455+
456+
iface eth? inet dhcp
457+
pre-up ethtool -s eth? advertise 0x1800000001028 || true
458+
443459
Generic Receive Offload, aka GRO
444460
--------------------------------
445461
The driver supports the in-kernel software implementation of GRO. GRO has

Documentation/networking/timestamping.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,8 +582,8 @@ Time stamps for outgoing packets are to be generated as follows:
582582
and hardware timestamping is not possible (SKBTX_IN_PROGRESS not set).
583583
- As soon as the driver has sent the packet and/or obtained a
584584
hardware time stamp for it, it passes the time stamp back by
585-
calling skb_hwtstamp_tx() with the original skb, the raw
586-
hardware time stamp. skb_hwtstamp_tx() clones the original skb and
585+
calling skb_tstamp_tx() with the original skb, the raw
586+
hardware time stamp. skb_tstamp_tx() clones the original skb and
587587
adds the timestamps, therefore the original skb has to be freed now.
588588
If obtaining the hardware time stamp somehow fails, then the driver
589589
should not fall back to software time stamping. The rationale is that

Documentation/sound/hd-audio/models.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,8 @@ usi-headset
326326
Headset support on USI machines
327327
dual-codecs
328328
Lenovo laptops with dual codecs
329+
alc285-hp-amp-init
330+
HP laptops which require speaker amplifier initialization (ALC285)
329331

330332
ALC680
331333
======

MAINTAINERS

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3066,7 +3066,7 @@ F: Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
30663066
F: drivers/phy/qualcomm/phy-ath79-usb.c
30673067

30683068
ATHEROS ATH GENERIC UTILITIES
3069-
M: Kalle Valo <kvalo@codeaurora.org>
3069+
M: Kalle Valo <kvalo@kernel.org>
30703070
30713071
S: Supported
30723072
F: drivers/net/wireless/ath/*
@@ -3081,7 +3081,7 @@ W: https://wireless.wiki.kernel.org/en/users/Drivers/ath5k
30813081
F: drivers/net/wireless/ath/ath5k/
30823082

30833083
ATHEROS ATH6KL WIRELESS DRIVER
3084-
M: Kalle Valo <kvalo@codeaurora.org>
3084+
M: Kalle Valo <kvalo@kernel.org>
30853085
30863086
S: Supported
30873087
W: https://wireless.wiki.kernel.org/en/users/Drivers/ath6kl
@@ -13248,7 +13248,7 @@ F: include/uapi/linux/if_*
1324813248
F: include/uapi/linux/netdevice.h
1324913249

1325013250
NETWORKING DRIVERS (WIRELESS)
13251-
M: Kalle Valo <kvalo@codeaurora.org>
13251+
M: Kalle Valo <kvalo@kernel.org>
1325213252
1325313253
S: Maintained
1325413254
Q: http://patchwork.kernel.org/project/linux-wireless/list/
@@ -14845,7 +14845,7 @@ PCIE DRIVER FOR MEDIATEK
1484514845
M: Ryder Lee <[email protected]>
1484614846
M: Jianjun Wang <[email protected]>
1484714847
14848-
14848+
L: [email protected] (moderated for non-subscribers)
1484914849
S: Supported
1485014850
F: Documentation/devicetree/bindings/pci/mediatek*
1485114851
F: drivers/pci/controller/*mediatek*
@@ -15704,15 +15704,15 @@ T: git git://linuxtv.org/anttip/media_tree.git
1570415704
F: drivers/media/tuners/qt1010*
1570515705

1570615706
QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
15707-
M: Kalle Valo <kvalo@codeaurora.org>
15707+
M: Kalle Valo <kvalo@kernel.org>
1570815708
1570915709
S: Supported
1571015710
W: https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
1571115711
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
1571215712
F: drivers/net/wireless/ath/ath10k/
1571315713

1571415714
QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
15715-
M: Kalle Valo <kvalo@codeaurora.org>
15715+
M: Kalle Valo <kvalo@kernel.org>
1571615716
1571715717
S: Supported
1571815718
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
@@ -15885,7 +15885,7 @@ F: Documentation/devicetree/bindings/media/*venus*
1588515885
F: drivers/media/platform/qcom/venus/
1588615886

1588715887
QUALCOMM WCN36XX WIRELESS DRIVER
15888-
M: Kalle Valo <kvalo@codeaurora.org>
15888+
M: Kalle Valo <kvalo@kernel.org>
1588915889
1589015890
S: Supported
1589115891
W: https://wireless.wiki.kernel.org/en/users/Drivers/wcn36xx
@@ -17423,7 +17423,7 @@ F: drivers/video/fbdev/sm712*
1742317423
SILVACO I3C DUAL-ROLE MASTER
1742417424
M: Miquel Raynal <[email protected]>
1742517425
M: Conor Culhane <[email protected]>
17426-
17426+
L: [email protected] (moderated for non-subscribers)
1742717427
S: Maintained
1742817428
F: Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml
1742917429
F: drivers/i3c/master/svc-i3c-master.c
@@ -21059,7 +21059,7 @@ S: Maintained
2105921059
F: arch/x86/kernel/cpu/zhaoxin.c
2106021060

2106121061
ZONEFS FILESYSTEM
21062-
M: Damien Le Moal <[email protected]>
21062+
M: Damien Le Moal <damien.lemoal@opensource.wdc.com>
2106321063
M: Naohiro Aota <[email protected]>
2106421064
R: Johannes Thumshirn <[email protected]>
2106521065

0 commit comments

Comments
 (0)