Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (a7384f39) · Commits · EulixOS / Software / Kernel

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,8 @@ Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com>
		Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>
		Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
		Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
		Ben Dooks <ben-linux@fluff.org> <ben.dooks@simtec.co.uk>
		Ben Dooks <ben-linux@fluff.org> <ben.dooks@sifive.com>
		Ben Gardner <bgardner@wabtec.com>
		Ben M Cahill <ben.m.cahill@intel.com>
		Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>

Documentation/riscv/patch-acceptance.rst

+18 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,24 @@ tested code over experimental code. We wish to extend these same
		principles to the RISC-V-related code that will be accepted for
		inclusion in the kernel.

		Patchwork
		---------

		RISC-V has a patchwork instance, where the status of patches can be checked:

		https://patchwork.kernel.org/project/linux-riscv/list/

		If your patch does not appear in the default view, the RISC-V maintainers have
		likely either requested changes, or expect it to be applied to another tree.

		Automation runs against this patchwork instance, building/testing patches as
		they arrive. The automation applies patches against the current HEAD of the
		RISC-V `for-next` and `fixes` branches, depending on whether the patch has been
		detected as a fix. Failing those, it will use the RISC-V `master` branch.
		The exact commit to which a series has been applied will be noted on patchwork.
		Patches for which any of the checks fail are unlikely to be applied and in most
		cases will need to be resubmitted.

		Submit Checklist Addendum
		-------------------------
		We'll only accept patches for new modules or extensions if the

Documentation/trace/user_events.rst

+3 −4

Original line number	Diff line number	Diff line
		@@ -14,10 +14,6 @@ Programs can view status of the events via
		/sys/kernel/tracing/user_events_status and can both register and write
		data out via /sys/kernel/tracing/user_events_data.

		Programs can also use /sys/kernel/tracing/dynamic_events to register and
		delete user based events via the u: prefix. The format of the command to
		dynamic_events is the same as the ioctl with the u: prefix applied.

		Typically programs will register a set of events that they wish to expose to
		tools that can read trace_events (such as ftrace and perf). The registration
		process tells the kernel which address and bit to reflect if any tool has
		@@ -144,6 +140,9 @@ its name. Delete will only succeed if there are no references left to the
		event (in both user and kernel space). User programs should use a separate file
		to request deletes than the one used for registration due to this.

		NOTE: By default events will auto-delete when there are no references left
		to the event. Flags in the future may change this logic.

		Unregistering
		-------------
		If after registering an event it is no longer wanted to be updated then it can

MAINTAINERS

+9 −7

Original line number	Diff line number	Diff line
		@@ -9971,8 +9971,9 @@ M: Miquel Raynal <miquel.raynal@bootlin.com>
		L: linux-wpan@vger.kernel.org
		S: Maintained
		W: https://linux-wpan.org/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next.git
		Q: https://patchwork.kernel.org/project/linux-wpan/list/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git
		F: Documentation/networking/ieee802154.rst
		F: drivers/net/ieee802154/
		F: include/linux/ieee802154.h
		@@ -13283,10 +13284,11 @@ F: drivers/memory/mtk-smi.c
		F: include/soc/mediatek/smi.h

		MEDIATEK SWITCH DRIVER
		M: Sean Wang <sean.wang@mediatek.com>
		M: Arınç ÜNAL <arinc.unal@arinc9.com>
		M: Daniel Golle <daniel@makrotopia.org>
		M: Landen Chao <Landen.Chao@mediatek.com>
		M: DENG Qingfang <dqfext@gmail.com>
		M: Daniel Golle <daniel@makrotopia.org>
		M: Sean Wang <sean.wang@mediatek.com>
		L: netdev@vger.kernel.org
		S: Maintained
		F: drivers/net/dsa/mt7530-mdio.c
		@@ -16399,7 +16401,7 @@ F: Documentation/devicetree/bindings/pci/intel,keembay-pcie*
		F: drivers/pci/controller/dwc/pcie-keembay.c

		PCIE DRIVER FOR INTEL LGM GW SOC
		M: Rahul Tanwar <rtanwar@maxlinear.com>
		M: Chuanhua Lei <lchuanhua@maxlinear.com>
		L: linux-pci@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml
		@@ -17842,7 +17844,7 @@ F: tools/testing/selftests/rtc/
		Real-time Linux Analysis (RTLA) tools
		M: Daniel Bristot de Oliveira <bristot@kernel.org>
		M: Steven Rostedt <rostedt@goodmis.org>
		L: linux-trace-devel@vger.kernel.org
		L: linux-trace-kernel@vger.kernel.org
		S: Maintained
		F: Documentation/tools/rtla/
		F: tools/tracing/rtla/
		@@ -18412,7 +18414,7 @@ F: drivers/infiniband/ulp/rtrs/
		RUNTIME VERIFICATION (RV)
		M: Daniel Bristot de Oliveira <bristot@kernel.org>
		M: Steven Rostedt <rostedt@goodmis.org>
		L: linux-trace-devel@vger.kernel.org
		L: linux-trace-kernel@vger.kernel.org
		S: Maintained
		F: Documentation/trace/rv/
		F: include/linux/rv.h

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		VERSION = 6
		PATCHLEVEL = 4
		SUBLEVEL = 0
		EXTRAVERSION = -rc6
		EXTRAVERSION = -rc7
		NAME = Hurr durr I'ma ninja sloth

		# DOCUMENTATION