Commit a6bdc082 authored Nov 01, 2023 by Huacai Chen

Merge 'bpf-next 2023-10-16' into loongarch-next

LoongArch architecture changes for 6.7 (BPF CPU v4 support) depend on
the bpf changes to fix conflictions in selftests and work, so merge them
to create a base.

parents ffc25326 99c9991f

Documentation/admin-guide/sysctl/net.rst

+1 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ two flavors of JITs, the newer eBPF JIT currently supported on:
		- s390x
		- riscv64
		- riscv32
		- loongarch64

		And the older cBPF JIT supported on the following archs:

Documentation/bpf/libbpf/program_types.rst

+10 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,16 @@ described in more detail in the footnotes.
		\| \| ``BPF_CGROUP_UDP6_RECVMSG`` \| ``cgroup/recvmsg6`` \| \|
		+ +----------------------------------------+----------------------------------+-----------+
		\| \| ``BPF_CGROUP_UDP6_SENDMSG`` \| ``cgroup/sendmsg6`` \| \|
		\| +----------------------------------------+----------------------------------+-----------+
		\| \| ``BPF_CGROUP_UNIX_CONNECT`` \| ``cgroup/connect_unix`` \| \|
		\| +----------------------------------------+----------------------------------+-----------+
		\| \| ``BPF_CGROUP_UNIX_SENDMSG`` \| ``cgroup/sendmsg_unix`` \| \|
		\| +----------------------------------------+----------------------------------+-----------+
		\| \| ``BPF_CGROUP_UNIX_RECVMSG`` \| ``cgroup/recvmsg_unix`` \| \|
		\| +----------------------------------------+----------------------------------+-----------+
		\| \| ``BPF_CGROUP_UNIX_GETPEERNAME`` \| ``cgroup/getpeername_unix`` \| \|
		\| +----------------------------------------+----------------------------------+-----------+
		\| \| ``BPF_CGROUP_UNIX_GETSOCKNAME`` \| ``cgroup/getsockname_unix`` \| \|
		+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
		\| ``BPF_PROG_TYPE_CGROUP_SOCK`` \| ``BPF_CGROUP_INET4_POST_BIND`` \| ``cgroup/post_bind4`` \| \|
		+ +----------------------------------------+----------------------------------+-----------+

Documentation/bpf/prog_flow_dissector.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ Flags
		used by ``eth_get_headlen`` to estimate length of all headers for GRO.
		* ``BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL`` - tells BPF flow dissector to
		stop parsing as soon as it reaches IPv6 flow label; used by
		``___skb_get_hash`` and ``__skb_get_hash_symmetric`` to get flow hash.
		``___skb_get_hash`` to get flow hash.
		* ``BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP`` - tells BPF flow dissector to stop
		parsing as soon as it reaches encapsulated headers; used by routing
		infrastructure.

Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ properties:
		- mediatek,mt7622-wed
		- mediatek,mt7981-wed
		- mediatek,mt7986-wed
		- mediatek,mt7988-wed
		- const: syscon

		reg:

Documentation/devicetree/bindings/mfd/syscon.yaml

+2 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ properties:
		- hisilicon,peri-subctrl
		- hpe,gxp-sysreg
		- intel,lgm-syscon
		- loongson,ls1b-syscon
		- loongson,ls1c-syscon
		- marvell,armada-3700-usb2-host-misc
		- mediatek,mt8135-pctl-a-syscfg
		- mediatek,mt8135-pctl-b-syscfg