Commit 337079d3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files


Cross-merge networking fixes after downstream PR (net-6.15-rc5).

No conflicts or adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents deeed351 ebd297a2
Loading
Loading
Loading
Loading
+8 −21
Original line number Diff line number Diff line
@@ -562,19 +562,6 @@ The interesting knobs for XFS workqueues are as follows:
Zoned Filesystems
=================

For zoned file systems, the following attribute is exposed in:

  /sys/fs/xfs/<dev>/zoned/

  max_open_zones		(Min:  1  Default:  Varies  Max:  UINTMAX)
	This read-only attribute exposes the maximum number of open zones
	available for data placement. The value is determined at mount time and
	is limited by the capabilities of the backing zoned device, file system
	size and the max_open_zones mount option.

Zoned Filesystems
=================

For zoned file systems, the following attributes are exposed in:

  /sys/fs/xfs/<dev>/zoned/
+6 −6
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ target architecture, specifically, is the 32-bit OpenRISC 1000 family (or1k).

For information about OpenRISC processors and ongoing development:

	=======		=============================
	=======		==============================
	website		https://openrisc.io
	email		openrisc@lists.librecores.org
	=======		=============================
	email		linux-openrisc@vger.kernel.org
	=======		==============================

---------------------------------------------------------------------

@@ -27,11 +27,11 @@ Toolchain binaries can be obtained from openrisc.io or our github releases page.
Instructions for building the different toolchains can be found on openrisc.io
or Stafford's toolchain build and release scripts.

	==========	=================================================
	binaries	https://github.com/openrisc/or1k-gcc/releases
	==========	==========================================================
	binaries	https://github.com/stffrdhrn/or1k-toolchain-build/releases
	toolchains	https://openrisc.io/software
	building	https://github.com/stffrdhrn/or1k-toolchain-build
	==========	=================================================
	==========	==========================================================

2) Building

+8 −0
Original line number Diff line number Diff line
@@ -382,6 +382,14 @@ In case of new BPF instructions, once the changes have been accepted
into the Linux kernel, please implement support into LLVM's BPF back
end. See LLVM_ section below for further information.

Q: What "BPF_INTERNAL" symbol namespace is for?
-----------------------------------------------
A: Symbols exported as BPF_INTERNAL can only be used by BPF infrastructure
like preload kernel modules with light skeleton. Most symbols outside
of BPF_INTERNAL are not expected to be used by code outside of BPF either.
Symbols may lack the designation because they predate the namespaces,
or due to an oversight.

Stable submission
=================

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ properties:
    $ref: /schemas/types.yaml#/definitions/uint32-array
    items:
      - minimum: 0
        maximum: 7
        maximum: 31
        description:
          Offset in bit within the address range specified by reg.
      - minimum: 1
+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties:
      - enum:
          - qcom,apq8064-qfprom
          - qcom,apq8084-qfprom
          - qcom,ipq5018-qfprom
          - qcom,ipq5332-qfprom
          - qcom,ipq5424-qfprom
          - qcom,ipq6018-qfprom
@@ -28,6 +29,8 @@ properties:
          - qcom,msm8226-qfprom
          - qcom,msm8916-qfprom
          - qcom,msm8917-qfprom
          - qcom,msm8937-qfprom
          - qcom,msm8960-qfprom
          - qcom,msm8974-qfprom
          - qcom,msm8976-qfprom
          - qcom,msm8996-qfprom
@@ -51,6 +54,7 @@ properties:
          - qcom,sm8450-qfprom
          - qcom,sm8550-qfprom
          - qcom,sm8650-qfprom
          - qcom,x1e80100-qfprom
      - const: qcom,qfprom

  reg:
Loading