Skip to content

Commit 44889ba

Browse files
torvaldstorvalds
committed
Merge tag 'net-6.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Paolo Abeni: "Including fixes from netfilter and bpf. Current release - regressions: - core: avoid skb end_offset change in __skb_unclone_keeptruesize() - sched: - act_connmark: handle errno on tcf_idr_check_alloc - flower: fix fl_change() error recovery path - ieee802154: prevent user from crashing the host Current release - new code bugs: - eth: bnxt_en: fix the double free during device removal - tools: ynl: - fix enum-as-flags in the generic CLI - fully inherit attrs in subsets - re-license uniformly under GPL-2.0 or BSD-3-clause Previous releases - regressions: - core: use indirect calls helpers for sk_exit_memory_pressure() - tls: - fix return value for async crypto - avoid hanging tasks on the tx_lock - eth: ice: copy last block omitted in ice_get_module_eeprom() Previous releases - always broken: - core: avoid double iput when sock_alloc_file fails - af_unix: fix struct pid leaks in OOB support - tls: - fix possible race condition - fix device-offloaded sendpage straddling records - bpf: - sockmap: fix an infinite loop error - test_run: fix &xdp_frame misplacement for LIVE_FRAMES - fix resolving BTF_KIND_VAR after ARRAY, STRUCT, UNION, PTR - netfilter: tproxy: fix deadlock due to missing BH disable - phylib: get rid of unnecessary locking - eth: bgmac: fix *initial* chip reset to support BCM5358 - eth: nfp: fix csum for ipsec offload - eth: mtk_eth_soc: fix RX data corruption issue Misc: - usb: qmi_wwan: add telit 0x1080 composition" * tag 'net-6.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (64 commits) tools: ynl: fix enum-as-flags in the generic CLI tools: ynl: move the enum classes to shared code net: avoid double iput when sock_alloc_file fails af_unix: fix struct pid leaks in OOB support eth: fealnx: bring back this old driver net: dsa: mt7530: permit port 5 to work without port 6 on MT7621 SoC net: microchip: sparx5: fix deletion of existing DSCP mappings octeontx2-af: Unlock contexts in the queue context cache in case of fault detection net/smc: fix fallback failed while sendmsg with fastopen ynl: re-license uniformly under GPL-2.0 OR BSD-3-Clause mailmap: update entries for Stephen Hemminger mailmap: add entry for Maxim Mikityanskiy nfc: change order inside nfc_se_io error path ethernet: ice: avoid gcc-9 integer overflow warning ice: don't ignore return codes in VSI related code ice: Fix DSCP PFC TLV creation net: usb: qmi_wwan: add Telit 0x1080 composition net: usb: cdc_mbim: avoid altsetting toggling for Telit FE990 netfilter: conntrack: adopt safer max chain length net: tls: fix device-offloaded sendpage straddling records ...
2 parents 2653e3f + 67eeadf commit 44889ba

File tree

92 files changed

+2599
-356
lines changed

Some content is hidden

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

92 files changed

+2599
-356
lines changed

‎.mailmap

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,8 @@ Mauro Carvalho Chehab <[email protected]> <[email protected]>
306306
Mauro Carvalho Chehab <[email protected]> <[email protected]>
307307
Mauro Carvalho Chehab <[email protected]> <[email protected]>
308308
Mauro Carvalho Chehab <[email protected]> <[email protected]>
309+
Maxim Mikityanskiy <[email protected]> <[email protected]>
310+
Maxim Mikityanskiy <[email protected]> <[email protected]>
309311
Maxime Ripard <[email protected]> <[email protected]>
310312
Maxime Ripard <[email protected]> <[email protected]>
311313
Mayuresh Janorkar <[email protected]>
@@ -411,7 +413,10 @@ Shuah Khan <[email protected]> <[email protected]>
411413
Simon Arlott <[email protected]> <[email protected]>
412414
Simon Kelley <[email protected]>
413415
Stéphane Witzmann <[email protected]>
414-
Stephen Hemminger <[email protected]>
416+
Stephen Hemminger <[email protected]> <[email protected]>
417+
Stephen Hemminger <[email protected]> <[email protected]>
418+
Stephen Hemminger <[email protected]> <[email protected]>
419+
Stephen Hemminger <[email protected]> <[email protected]>
415420
Steve Wise <[email protected]> <[email protected]>
416421
Steve Wise <[email protected]> <[email protected]>
417422
Subash Abhinov Kasiviswanathan <[email protected]>

‎Documentation/bpf/bpf_devel_QA.rst

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ workflows related to reporting bugs, submitting patches, and queueing
77
patches for stable kernels.
88

99
For general information about submitting patches, please refer to
10-
`Documentation/process/`_. This document only describes additional specifics
11-
related to BPF.
10+
Documentation/process/submitting-patches.rst. This document only describes
11+
additional specifics related to BPF.
1212

1313
.. contents::
1414
:local:
@@ -461,15 +461,15 @@ needed::
461461

462462
$ sudo make run_tests
463463

464-
See the kernels selftest `Documentation/dev-tools/kselftest.rst`_
465-
document for further documentation.
464+
See :doc:`kernel selftest documentation </dev-tools/kselftest>`
465+
for details.
466466

467467
To maximize the number of tests passing, the .config of the kernel
468468
under test should match the config file fragment in
469469
tools/testing/selftests/bpf as closely as possible.
470470

471471
Finally to ensure support for latest BPF Type Format features -
472-
discussed in `Documentation/bpf/btf.rst`_ - pahole version 1.16
472+
discussed in Documentation/bpf/btf.rst - pahole version 1.16
473473
is required for kernels built with CONFIG_DEBUG_INFO_BTF=y.
474474
pahole is delivered in the dwarves package or can be built
475475
from source at
@@ -684,12 +684,8 @@ when:
684684

685685

686686
.. Links
687-
.. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/
688687
.. _netdev-FAQ: Documentation/process/maintainer-netdev.rst
689688
.. _selftests:
690689
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/bpf/
691-
.. _Documentation/dev-tools/kselftest.rst:
692-
https://www.kernel.org/doc/html/latest/dev-tools/kselftest.html
693-
.. _Documentation/bpf/btf.rst: btf.rst
694690

695691
Happy BPF hacking!

‎Documentation/netlink/genetlink-c.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
22
%YAML 1.2
33
---
44
$id: http://kernel.org/schemas/netlink/genetlink-c.yaml#

‎Documentation/netlink/genetlink-legacy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
22
%YAML 1.2
33
---
44
$id: http://kernel.org/schemas/netlink/genetlink-legacy.yaml#

‎Documentation/netlink/genetlink.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
22
%YAML 1.2
33
---
44
$id: http://kernel.org/schemas/netlink/genetlink-legacy.yaml#

‎Documentation/netlink/specs/ethtool.yaml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
2+
13
name: ethtool
24

35
protocol: genetlink-legacy
@@ -11,7 +13,6 @@ attribute-sets:
1113
-
1214
name: dev-index
1315
type: u32
14-
value: 1
1516
-
1617
name: dev-name
1718
type: string
@@ -25,7 +26,6 @@ attribute-sets:
2526
-
2627
name: index
2728
type: u32
28-
value: 1
2929
-
3030
name: name
3131
type: string
@@ -39,14 +39,12 @@ attribute-sets:
3939
name: bit
4040
type: nest
4141
nested-attributes: bitset-bit
42-
value: 1
4342
-
4443
name: bitset
4544
attributes:
4645
-
4746
name: nomask
4847
type: flag
49-
value: 1
5048
-
5149
name: size
5250
type: u32
@@ -61,7 +59,6 @@ attribute-sets:
6159
-
6260
name: index
6361
type: u32
64-
value: 1
6562
-
6663
name: value
6764
type: string
@@ -71,7 +68,6 @@ attribute-sets:
7168
-
7269
name: string
7370
type: nest
74-
value: 1
7571
multi-attr: true
7672
nested-attributes: string
7773
-
@@ -80,7 +76,6 @@ attribute-sets:
8076
-
8177
name: id
8278
type: u32
83-
value: 1
8479
-
8580
name: count
8681
type: u32
@@ -96,14 +91,12 @@ attribute-sets:
9691
name: stringset
9792
type: nest
9893
multi-attr: true
99-
value: 1
10094
nested-attributes: stringset
10195
-
10296
name: strset
10397
attributes:
10498
-
10599
name: header
106-
value: 1
107100
type: nest
108101
nested-attributes: header
109102
-
@@ -119,7 +112,6 @@ attribute-sets:
119112
attributes:
120113
-
121114
name: header
122-
value: 1
123115
type: nest
124116
nested-attributes: header
125117
-
@@ -132,7 +124,6 @@ attribute-sets:
132124
attributes:
133125
-
134126
name: header
135-
value: 1
136127
type: nest
137128
nested-attributes: header
138129
-
@@ -180,7 +171,6 @@ attribute-sets:
180171
attributes:
181172
-
182173
name: pad
183-
value: 1
184174
type: pad
185175
-
186176
name: reassembly-errors
@@ -205,7 +195,6 @@ attribute-sets:
205195
attributes:
206196
-
207197
name: header
208-
value: 1
209198
type: nest
210199
nested-attributes: header
211200
-
@@ -251,13 +240,11 @@ operations:
251240

252241
do: &strset-get-op
253242
request:
254-
value: 1
255243
attributes:
256244
- header
257245
- stringsets
258246
- counts-only
259247
reply:
260-
value: 1
261248
attributes:
262249
- header
263250
- stringsets

‎Documentation/netlink/specs/fou.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
2+
13
name: fou
24

35
protocol: genetlink-legacy
@@ -26,6 +28,7 @@ attribute-sets:
2628
-
2729
name: unspec
2830
type: unused
31+
value: 0
2932
-
3033
name: port
3134
type: u16
@@ -71,6 +74,7 @@ operations:
7174
-
7275
name: unspec
7376
doc: unused
77+
value: 0
7478

7579
-
7680
name: add

‎Documentation/netlink/specs/netdev.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
2+
13
name: netdev
24

35
doc:
@@ -48,7 +50,6 @@ attribute-sets:
4850
name: ifindex
4951
doc: netdev ifindex
5052
type: u32
51-
value: 1
5253
checks:
5354
min: 1
5455
-
@@ -66,7 +67,6 @@ operations:
6667
-
6768
name: dev-get
6869
doc: Get / dump information about a netdev.
69-
value: 1
7070
attribute-set: dev
7171
do:
7272
request:

‎Documentation/userspace-api/netlink/specs.rst

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ YAML specifications can be found under ``Documentation/netlink/specs/``
2424
This document describes details of the schema.
2525
See :doc:`intro-specs` for a practical starting guide.
2626

27+
All specs must be licensed under ``GPL-2.0-only OR BSD-3-Clause``
28+
to allow for easy adoption in user space code.
29+
2730
Compatibility levels
2831
====================
2932

@@ -197,9 +200,15 @@ value
197200
Numerical attribute ID, used in serialized Netlink messages.
198201
The ``value`` property can be skipped, in which case the attribute ID
199202
will be the value of the previous attribute plus one (recursively)
200-
and ``0`` for the first attribute in the attribute set.
203+
and ``1`` for the first attribute in the attribute set.
204+
205+
Attributes (and operations) use ``1`` as the default value for the first
206+
entry (unlike enums in definitions which start from ``0``) because
207+
entry ``0`` is almost always reserved as undefined. Spec can explicitly
208+
set value to ``0`` if needed.
201209

202-
Note that the ``value`` of an attribute is defined only in its main set.
210+
Note that the ``value`` of an attribute is defined only in its main set
211+
(not in subsets).
203212

204213
enum
205214
~~~~

‎arch/mips/configs/mtx1_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ CONFIG_IXGB=m
284284
CONFIG_SKGE=m
285285
CONFIG_SKY2=m
286286
CONFIG_MYRI10GE=m
287+
CONFIG_FEALNX=m
287288
CONFIG_NATSEMI=m
288289
CONFIG_NS83820=m
289290
CONFIG_S2IO=m

0 commit comments

Comments
 (0)