Commit 6b5567b1 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



No conflicts.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents be6b41c1 8b97cae3

Documentation/ABI/testing/sysfs-driver-aspeed-uart-routing

+3 −3
Original line number Diff line number Diff line 
What:		/sys/bus/platform/drivers/aspeed-uart-routing/*/uart*

What:		/sys/bus/platform/drivers/aspeed-uart-routing/\*/uart\*

Date:		September 2021

Contact:	Oskar Senft <osk@google.com>

		Chia-Wei Wang <chiawei_wang@aspeedtech.com>
@@ -9,7 +9,7 @@ Description: Selects the RX source of the UARTx device. 
		depends on the selected file.



		e.g.

		cat /sys/bus/platform/drivers/aspeed-uart-routing/*.uart_routing/uart1

		cat /sys/bus/platform/drivers/aspeed-uart-routing/\*.uart_routing/uart1

		[io1] io2 io3 io4 uart2 uart3 uart4 io6



		In this case, UART1 gets its input from IO1 (physical serial port 1).
@@ -17,7 +17,7 @@ Description: Selects the RX source of the UARTx device. 
Users:		OpenBMC.  Proposed changes should be mailed to

		openbmc@lists.ozlabs.org



What:		/sys/bus/platform/drivers/aspeed-uart-routing/*/io*

What:		/sys/bus/platform/drivers/aspeed-uart-routing/\*/io\*

Date:		September 2021

Contact:	Oskar Senft <osk@google.com>

		Chia-Wei Wang <chiawei_wang@aspeedtech.com>

Documentation/devicetree/bindings/arm/omap/omap.txt

+3 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ Boards (incomplete list of examples): 
- OMAP3 BeagleBoard : Low cost community board

  compatible = "ti,omap3-beagle", "ti,omap3430", "ti,omap3"



- OMAP3 BeagleBoard A to B4 : Early BeagleBoard revisions A to B4 with a timer quirk

  compatible = "ti,omap3-beagle-ab4", "ti,omap3-beagle", "ti,omap3430", "ti,omap3"



- OMAP3 Tobi with Overo : Commercial expansion board with daughter board

  compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3430", "ti,omap3"

Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml

+15 −6
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ description: 
  contains a specific memory layout, which is documented in chapter 8 of the

  SiFive U5 Coreplex Series Manual <https://static.dev.sifive.com/U54-MC-RVCoreIP.pdf>.



  The thead,c900-plic is different from sifive,plic-1.0.0 in opensbi, the

  T-HEAD PLIC implementation requires setting a delegation bit to allow access

  from S-mode. So add thead,c900-plic to distinguish them.



maintainers:

  - Sagar Kadam <sagar.kadam@sifive.com>

  - Paul Walmsley  <paul.walmsley@sifive.com>
@@ -42,12 +46,17 @@ maintainers: 


properties:

  compatible:

    items:

    oneOf:

      - items:

          - enum:

              - sifive,fu540-c000-plic

              - starfive,jh7100-plic

              - canaan,k210-plic

          - const: sifive,plic-1.0.0

      - items:

          - enum:

              - allwinner,sun20i-d1-plic

          - const: thead,c900-plic



  reg:

    maxItems: 1

MAINTAINERS

+54 −15
Original line number Diff line number Diff line
@@ -1620,6 +1620,7 @@ M: Olof Johansson <olof@lixom.net> 
M:	soc@kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

C:	irc://irc.libera.chat/armlinux

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git

F:	arch/arm/boot/dts/Makefile

F:	arch/arm64/boot/dts/Makefile
@@ -1627,6 +1628,7 @@ F: arch/arm64/boot/dts/Makefile 
ARM SUB-ARCHITECTURES

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

C:	irc://irc.libera.chat/armlinux

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git

F:	arch/arm/mach-*/

F:	arch/arm/plat-*/
@@ -1780,6 +1782,7 @@ F: drivers/irqchip/irq-apple-aic.c 
F:	drivers/mailbox/apple-mailbox.c

F:	drivers/pinctrl/pinctrl-apple-gpio.c

F:	drivers/soc/apple/*

F:	drivers/watchdog/apple_wdt.c

F:	include/dt-bindings/interrupt-controller/apple-aic.h

F:	include/dt-bindings/pinctrl/apple.h

F:	include/linux/apple-mailbox.h
@@ -2570,10 +2573,13 @@ N: rockchip 








ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









R:	Alim Akhtar <alim.akhtar@samsung.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org









S:	Maintained









C:	irc://irc.libera.chat/linux-exynos









Q:	https://patchwork.kernel.org/project/linux-samsung-soc/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git









F:	Documentation/arm/samsung/









F:	Documentation/devicetree/bindings/arm/samsung/









F:	Documentation/devicetree/bindings/power/pd-samsung.yaml








@@ -3133,11 +3139,9 @@ W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath5k







F:	drivers/net/wireless/ath/ath5k/

















ATHEROS ATH6KL WIRELESS DRIVER









M:	Kalle Valo <kvalo@kernel.org>









L:	linux-wireless@vger.kernel.org









S:	Supported









S:	Orphan









W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath6kl









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git









F:	drivers/net/wireless/ath/ath6kl/

















ATI_REMOTE2 DRIVER








@@ -5774,7 +5778,7 @@ F:	tools/testing/selftests/dma/















DMA-BUF HEAPS FRAMEWORK









M:	Sumit Semwal <sumit.semwal@linaro.org>









R:	Benjamin Gaignard <benjamin.gaignard@linaro.org>









R:	Benjamin Gaignard <benjamin.gaignard@collabora.com>









R:	Liam Mark <lmark@codeaurora.org>









R:	Laura Abbott <labbott@redhat.com>









R:	Brian Starkey <Brian.Starkey@arm.com>








@@ -6504,7 +6508,7 @@ F:	Documentation/devicetree/bindings/display/rockchip/







F:	drivers/gpu/drm/rockchip/

















DRM DRIVERS FOR STI









M:	Benjamin Gaignard <benjamin.gaignard@linaro.org>









M:	Alain Volmat <alain.volmat@foss.st.com>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









T:	git git://anongit.freedesktop.org/drm/drm-misc








@@ -6513,8 +6517,8 @@ F:	drivers/gpu/drm/sti















DRM DRIVERS FOR STM









M:	Yannick Fertre <yannick.fertre@foss.st.com>









M:	Raphael Gallais-Pou <raphael.gallais-pou@foss.st.com>









M:	Philippe Cornu <philippe.cornu@foss.st.com>









M:	Benjamin Gaignard <benjamin.gaignard@linaro.org>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









T:	git git://anongit.freedesktop.org/drm/drm-misc








@@ -7184,7 +7188,7 @@ F:	drivers/net/can/usb/etas_es58x/















ETHERNET BRIDGE









M:	Roopa Prabhu <roopa@nvidia.com>









M:	Nikolay Aleksandrov <nikolay@nvidia.com>









M:	Nikolay Aleksandrov <razor@blackwall.org>









L:	bridge@lists.linux-foundation.org (moderated for non-subscribers)









L:	netdev@vger.kernel.org









S:	Maintained








@@ -7577,6 +7581,12 @@ S:	Maintained







W:	http://floatingpoint.sourceforge.net/emulator/index.html









F:	arch/x86/math-emu/

















FRAMEBUFFER CORE









M:	Daniel Vetter <daniel@ffwll.ch>









F:	drivers/video/fbdev/core/









S:	Odd Fixes









T:	git git://anongit.freedesktop.org/drm/drm-misc

















FRAMEBUFFER LAYER









M:	Helge Deller <deller@gmx.de>









L:	linux-fbdev@vger.kernel.org








@@ -14391,6 +14401,7 @@ M:	Rob Herring <robh+dt@kernel.org>







M:	Frank Rowand <frowand.list@gmail.com>









L:	devicetree@vger.kernel.org









S:	Maintained









C:	irc://irc.libera.chat/devicetree









W:	http://www.devicetree.org/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git









F:	Documentation/ABI/testing/sysfs-firmware-ofw








@@ -14402,6 +14413,7 @@ OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS







M:	Rob Herring <robh+dt@kernel.org>









L:	devicetree@vger.kernel.org









S:	Maintained









C:	irc://irc.libera.chat/devicetree









Q:	http://patchwork.ozlabs.org/project/devicetree-bindings/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git









F:	Documentation/devicetree/








@@ -15135,7 +15147,7 @@ M:	Ingo Molnar <mingo@redhat.com>







M:	Arnaldo Carvalho de Melo <acme@kernel.org>









R:	Mark Rutland <mark.rutland@arm.com>









R:	Alexander Shishkin <alexander.shishkin@linux.intel.com>









R:	Jiri Olsa <jolsa@redhat.com>









R:	Jiri Olsa <jolsa@kernel.org>









R:	Namhyung Kim <namhyung@kernel.org>









L:	linux-perf-users@vger.kernel.org









L:	linux-kernel@vger.kernel.org








@@ -15292,9 +15304,11 @@ PIN CONTROLLER - SAMSUNG







M:	Tomasz Figa <tomasz.figa@gmail.com>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Sylwester Nawrocki <s.nawrocki@samsung.com>









R:	Alim Akhtar <alim.akhtar@samsung.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org









S:	Maintained









C:	irc://irc.libera.chat/linux-exynos









Q:	https://patchwork.kernel.org/project/linux-samsung-soc/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git









F:	Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt








@@ -15898,6 +15912,7 @@ S:	Supported







W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath10k









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git









F:	drivers/net/wireless/ath/ath10k/









F:	Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt

















QUALCOMM ATHEROS ATH11K WIRELESS DRIVER









M:	Kalle Valo <kvalo@kernel.org>








@@ -15905,11 +15920,12 @@ L:	ath11k@lists.infradead.org







S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git









F:	drivers/net/wireless/ath/ath11k/









F:	Documentation/devicetree/bindings/net/wireless/qcom,ath11k.txt

















QUALCOMM ATHEROS ATH9K WIRELESS DRIVER









M:	ath9k-devel@qca.qualcomm.com









M:	Toke Høiland-Jørgensen <toke@toke.dk>









L:	linux-wireless@vger.kernel.org









S:	Supported









S:	Maintained









W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath9k









F:	Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml









F:	drivers/net/wireless/ath/ath9k/








@@ -16090,11 +16106,10 @@ F:	Documentation/devicetree/bindings/media/*venus*







F:	drivers/media/platform/qcom/venus/

















QUALCOMM WCN36XX WIRELESS DRIVER









M:	Kalle Valo <kvalo@kernel.org>









M:	Loic Poulain <loic.poulain@linaro.org>









L:	wcn36xx@lists.infradead.org









S:	Supported









W:	https://wireless.wiki.kernel.org/en/users/Drivers/wcn36xx









T:	git git://github.com/KrasnikovEugene/wcn36xx.git









F:	drivers/net/wireless/ath/wcn36xx/

















QUANTENNA QTNFMAC WIRELESS DRIVER








@@ -16818,8 +16833,8 @@ F:	drivers/video/fbdev/savage/







S390









M:	Heiko Carstens <hca@linux.ibm.com>









M:	Vasily Gorbik <gor@linux.ibm.com>









M:	Christian Borntraeger <borntraeger@linux.ibm.com>









R:	Alexander Gordeev <agordeev@linux.ibm.com>









M:	Alexander Gordeev <agordeev@linux.ibm.com>









R:	Christian Borntraeger <borntraeger@linux.ibm.com>









R:	Sven Schnelle <svens@linux.ibm.com>









L:	linux-s390@vger.kernel.org









S:	Supported








@@ -17090,6 +17105,7 @@ SAMSUNG SOC CLOCK DRIVERS







M:	Sylwester Nawrocki <s.nawrocki@samsung.com>









M:	Tomasz Figa <tomasz.figa@gmail.com>









M:	Chanwoo Choi <cw00.choi@samsung.com>









R:	Alim Akhtar <alim.akhtar@samsung.com>









L:	linux-samsung-soc@vger.kernel.org









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git








@@ -17726,6 +17742,21 @@ S:	Maintained







W:	http://www.winischhofer.at/linuxsisusbvga.shtml









F:	drivers/usb/misc/sisusbvga/

















SL28 CPLD MFD DRIVER









M:	Michael Walle <michael@walle.cc>









S:	Maintained









F:	Documentation/devicetree/bindings/gpio/kontron,sl28cpld-gpio.yaml









F:	Documentation/devicetree/bindings/hwmon/kontron,sl28cpld-hwmon.yaml









F:	Documentation/devicetree/bindings/interrupt-controller/kontron,sl28cpld-intc.yaml









F:	Documentation/devicetree/bindings/mfd/kontron,sl28cpld.yaml









F:	Documentation/devicetree/bindings/pwm/kontron,sl28cpld-pwm.yaml









F:	Documentation/devicetree/bindings/watchdog/kontron,sl28cpld-wdt.yaml









F:	drivers/gpio/gpio-sl28cpld.c









F:	drivers/hwmon/sl28cpld-hwmon.c









F:	drivers/irqchip/irq-sl28cpld.c









F:	drivers/pwm/pwm-sl28cpld.c









F:	drivers/watchdog/sl28cpld_wdt.c

















SLAB ALLOCATOR









M:	Christoph Lameter <cl@linux.com>









M:	Pekka Enberg <penberg@kernel.org>








@@ -18442,7 +18473,7 @@ F:	Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt







F:	sound/soc/sti/

















STI CEC DRIVER









M:	Benjamin Gaignard <benjamin.gaignard@linaro.org>









M:	Alain Volmat <alain.volmat@foss.st.com>









S:	Maintained









F:	Documentation/devicetree/bindings/media/stih-cec.txt









F:	drivers/media/cec/platform/sti/








@@ -19596,6 +19627,14 @@ F:	Documentation/trace/timerlat-tracer.rst







F:	Documentation/trace/hwlat_detector.rst









F:	arch/*/kernel/trace.c

















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









S:	Maintained









F:	Documentation/tools/rtla/









F:	tools/tracing/rtla/

















TRADITIONAL CHINESE DOCUMENTATION









M:	Hu Haowen <src.res@email.cn>









L:	linux-doc-tw-discuss@lists.sourceforge.net

























Makefile



+2
−2






























Original line number
Diff line number
Diff line







@@ -2,8 +2,8 @@







VERSION = 5









PATCHLEVEL = 17









SUBLEVEL = 0









EXTRAVERSION = -rc3









NAME = Gobble Gobble









EXTRAVERSION = -rc4









NAME = Superb Owl



















# *DOCUMENTATION*









# To see a list of typical targets execute "make help"