All patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
-LINUX_VERSION-5.15 = .95
-LINUX_KERNEL_HASH-5.15.95 = ea71d1f0d28803679dfdc2278fd9f145f12cb566a796502182d719312756441b
+LINUX_VERSION-5.15 = .96
+LINUX_KERNEL_HASH-5.15.96 = 348d974c143fdef8517ec703fdaa24bade12a49047848be92cb9e3253b19ef98
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3554,6 +3554,13 @@ N: bcm113*
+@@ -3555,6 +3555,13 @@ N: bcm113*
N: bcm216*
N: kona
+...
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3554,6 +3554,13 @@ N: bcm113*
+@@ -3555,6 +3555,13 @@ N: bcm113*
N: bcm216*
N: kona
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3562,7 +3562,7 @@ F: Documentation/devicetree/bindings/med
+@@ -3563,7 +3563,7 @@ F: Documentation/devicetree/bindings/med
F: drivers/staging/media/rpivid
BROADCOM BCM2835 CAMERA DRIVER
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3566,7 +3566,7 @@ M: Raspberry Pi Kernel Maintenance <kern
+@@ -3567,7 +3567,7 @@ M: Raspberry Pi Kernel Maintenance <kern
L: linux-media@vger.kernel.org
S: Maintained
F: drivers/media/platform/bcm2835/
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -17529,6 +17529,14 @@ T: git git://linuxtv.org/media_tree.git
+@@ -17530,6 +17530,14 @@ T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
F: drivers/media/i2c/imx412.c
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3568,6 +3568,15 @@ S: Maintained
+@@ -3569,6 +3569,15 @@ S: Maintained
F: drivers/media/platform/bcm2835/
F: Documentation/devicetree/bindings/media/brcm,bcm2835-unicam.yaml
+...
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -17543,6 +17543,7 @@ M: Raspberry Pi Kernel Maintenance <kern
+@@ -17544,6 +17544,7 @@ M: Raspberry Pi Kernel Maintenance <kern
L: linux-media@vger.kernel.org
S: Maintained
T: git git://linuxtv.org/media_tree.git
+...
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -17547,6 +17547,14 @@ F: Documentation/devicetree/bindings/med
+@@ -17548,6 +17548,14 @@ F: Documentation/devicetree/bindings/med
F: Documentation/devicetree/bindings/media/i2c/imx477.yaml
F: drivers/media/i2c/imx477.c
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
-@@ -5742,13 +5742,13 @@ static const u32 hdmi_colorimetry_val[]
+@@ -5743,13 +5743,13 @@ static const u32 hdmi_colorimetry_val[]
#undef ACE
/**
const struct drm_connector_state *conn_state)
{
u32 colorimetry_val;
-@@ -5767,7 +5767,7 @@ drm_hdmi_avi_infoframe_colorspace(struct
+@@ -5768,7 +5768,7 @@ drm_hdmi_avi_infoframe_colorspace(struct
frame->extended_colorimetry = (colorimetry_val >> 2) &
EXTENDED_COLORIMETRY_MASK;
}
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -5980,6 +5980,14 @@ T: git git://anongit.freedesktop.org/drm
+@@ -5981,6 +5981,14 @@ T: git git://anongit.freedesktop.org/drm
F: Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt
F: drivers/gpu/drm/tiny/mi0283qt.c
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3900,6 +3900,7 @@ L: linux-mtd@lists.infradead.org
+@@ -3901,6 +3901,7 @@ L: linux-mtd@lists.infradead.org
L: bcm-kernel-feedback-list@broadcom.com
S: Maintained
F: drivers/mtd/nand/raw/brcmnand/
+ };
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3572,6 +3572,13 @@ F: Documentation/devicetree/bindings/net
+@@ -3573,6 +3573,13 @@ F: Documentation/devicetree/bindings/net
F: drivers/net/ethernet/broadcom/bcm4908_enet.*
F: drivers/net/ethernet/broadcom/unimac.h
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3578,6 +3578,7 @@ M: bcm-kernel-feedback-list@broadcom.com
+@@ -3579,6 +3579,7 @@ M: bcm-kernel-feedback-list@broadcom.com
L: linux-gpio@vger.kernel.org
S: Maintained
F: Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3430,6 +3430,7 @@ S: Supported
+@@ -3431,6 +3431,7 @@ S: Supported
F: arch/arm64/net/
BPF JIT for MIPS (32-BIT AND 64-BIT)
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -17953,6 +17953,11 @@ L: netdev@vger.kernel.org
+@@ -17954,6 +17954,11 @@ L: netdev@vger.kernel.org
S: Maintained
F: drivers/net/ethernet/dlink/sundance.c
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -12353,6 +12353,14 @@ S: Supported
+@@ -12354,6 +12354,14 @@ S: Supported
F: Documentation/devicetree/bindings/mtd/atmel-nand.txt
F: drivers/mtd/nand/raw/atmel/*
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -2352,6 +2352,13 @@ config UNUSED_KSYMS_WHITELIST
+@@ -2356,6 +2356,13 @@ config UNUSED_KSYMS_WHITELIST
one per line. The path can be absolute, or relative to the kernel
source tree.
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -2384,7 +2384,7 @@ config PADATA
+@@ -2388,7 +2388,7 @@ config PADATA
bool
config ASN1
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1443,6 +1443,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
+@@ -1447,6 +1447,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
the unaligned access emulation.
see arch/parisc/kernel/unaligned.c for reference
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1810,6 +1810,15 @@ config EMBEDDED
+@@ -1814,6 +1814,15 @@ config EMBEDDED
an embedded system so certain expert options are available
for configuration.
+};
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -7526,6 +7526,14 @@ F: drivers/ptp/ptp_qoriq.c
+@@ -7527,6 +7527,14 @@ F: drivers/ptp/ptp_qoriq.c
F: drivers/ptp/ptp_qoriq_debugfs.c
F: include/linux/fsl/ptp_qoriq.h
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -9063,6 +9063,22 @@ F: include/net/nl802154.h
+@@ -9064,6 +9064,22 @@ F: include/net/nl802154.h
F: net/ieee802154/
F: net/mac802154/
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -15890,6 +15890,13 @@ S: Maintained
+@@ -15891,6 +15891,13 @@ S: Maintained
F: include/sound/rt*.h
F: sound/soc/codecs/rt*