Commit 447212bb authored by Dave Airlie's avatar Dave Airlie
Browse files

BackMerge tag 'v5.15' into drm-next 



I got a drm-fixes which had some 5.15 stuff in it, so to avoid
the mess just backmerge here.

Linux 5.15

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents 951bad0b 8bb7eca9

Documentation/userspace-api/ioctl/ioctl-number.rst

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ Code Seq# Include File Comments 
'8'   all                                                            SNP8023 advanced NIC card

                                                                     <mailto:mcr@solidum.com>

';'   64-7F  linux/vfio.h

'='   00-3f  uapi/linux/ptp_clock.h                                  <mailto:richardcochran@gmail.com>

'@'   00-0F  linux/radeonfb.h                                        conflict!

'@'   00-0F  drivers/video/aty/aty128fb.c                            conflict!

'A'   00-1F  linux/apm_bios.h                                        conflict!

MAINTAINERS

+13 −1
Original line number Diff line number Diff line
@@ -5459,6 +5459,19 @@ F: include/net/devlink.h 
F:	include/uapi/linux/devlink.h

F:	net/core/devlink.c









DH ELECTRONICS IMX6 DHCOM BOARD SUPPORT









M:	Christoph Niedermaier <cniedermaier@dh-electronics.com>









L:	kernel@dh-electronics.com









S:	Maintained









F:	arch/arm/boot/dts/imx6*-dhcom-*

















DH ELECTRONICS STM32MP1 DHCOM/DHCOR BOARD SUPPORT









M:	Marek Vasut <marex@denx.de>









L:	kernel@dh-electronics.com









S:	Maintained









F:	arch/arm/boot/dts/stm32mp1*-dhcom-*









F:	arch/arm/boot/dts/stm32mp1*-dhcor-*

















DIALOG SEMICONDUCTOR DRIVERS









M:	Support Opensource <support.opensource@diasemi.com>









S:	Supported








@@ -11292,7 +11305,6 @@ F:	Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst







F:	drivers/net/ethernet/marvell/octeontx2/af/

















MARVELL PRESTERA ETHERNET SWITCH DRIVER









M:	Vadym Kochan <vkochan@marvell.com>









M:	Taras Chornyi <tchornyi@marvell.com>









S:	Supported









W:	https://github.com/Marvell-switching/switchdev-prestera
































Makefile



+2
−2






























Original line number
Diff line number
Diff line







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







VERSION = 5









PATCHLEVEL = 15









SUBLEVEL = 0









EXTRAVERSION = -rc7









NAME = Opossums on Parade









EXTRAVERSION =









NAME = Trick or Treat



















# *DOCUMENTATION*









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
































arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts



+1
−1






























Original line number
Diff line number
Diff line







@@ -112,7 +112,7 @@







	pinctrl-names = "default";









	pinctrl-0 = <&gmac_rgmii_pins>;









	phy-handle = <&phy1>;









	phy-mode = "rgmii";









	phy-mode = "rgmii-id";









	status = "okay";









};










































arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts



+1
−1






























Original line number
Diff line number
Diff line







@@ -75,7 +75,7 @@







	pinctrl-0 = <&emac_rgmii_pins>;









	phy-supply = <&reg_gmac_3v3>;









	phy-handle = <&ext_rgmii_phy>;









	phy-mode = "rgmii";









	phy-mode = "rgmii-id";









	status = "okay";









};