kernel: bump 5.15 to 5.15.96

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>

diff --git a/include/kernel-5.15 b/include/kernel-5.15
index a93da1e6a30113f6253924146c89e5663258fca7..5c90c189c4f7131389f333da8683d457ab06042c 100644 (file)
--- a/include/kernel-5.15
+++ b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .95
-LINUX_KERNEL_HASH-5.15.95 = ea71d1f0d28803679dfdc2278fd9f145f12cb566a796502182d719312756441b
+LINUX_VERSION-5.15 = .96
+LINUX_KERNEL_HASH-5.15.96 = 348d974c143fdef8517ec703fdaa24bade12a49047848be92cb9e3253b19ef98

diff --git a/target/linux/bcm27xx/patches-5.15/950-0127-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch b/target/linux/bcm27xx/patches-5.15/950-0127-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch
index f030bb33ed3ea5e56b6205eb8d044549934e9dbe..3913ddda2dfea33fcfce71a8c3633bbc192e3602 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0127-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0127-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch
@@ -12,7 +12,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS

-@@ -3554,6 +3554,13 @@ N:      bcm113*
+@@ -3555,6 +3555,13 @@ N:      bcm113*

  N:    bcm216*
  N:    kona
  
  N:    bcm216*
  N:    kona
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0202-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch b/target/linux/bcm27xx/patches-5.15/950-0202-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch
index 9833d5312da7b249c471b740c77b1c86e49770ab..375d488a92eb096f04ba5b80205b5432a5c3d82b 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0202-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0202-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch
@@ -90,7 +90,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 +...
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 +...
 --- a/MAINTAINERS
 +++ b/MAINTAINERS

-@@ -3554,6 +3554,13 @@ N:      bcm113*
+@@ -3555,6 +3555,13 @@ N:      bcm113*

  N:    bcm216*
  N:    kona
  
  N:    bcm216*
  N:    kona
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0210-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch b/target/linux/bcm27xx/patches-5.15/950-0210-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
index d1f115d9bea963ae878dd77ac55b60d087a986ab..b7bb1474ecf6fb2339b07f9aa99efdf1a5c1058f 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0210-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0210-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
@@ -28,7 +28,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 
 --- 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
  F:    drivers/staging/media/rpivid
  
  BROADCOM BCM2835 CAMERA DRIVER

diff --git a/target/linux/bcm27xx/patches-5.15/950-0246-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch b/target/linux/bcm27xx/patches-5.15/950-0246-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
index aece1d6229eeb46b024c9d4d5bea442a6c6fcc38..9f4a0f33ec741258148705dccf935dd1cf6f565d 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0246-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0246-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
@@ -31,7 +31,7 @@ Reported-by: kbuild test robot <lkp@intel.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 
 --- 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/
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/platform/bcm2835/

diff --git a/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch b/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch
index 2727d476d94b6300e99cc4944842c27327392db0..7690153d3db3a016af766372d4ba27829b3a423a 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch
@@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 
 --- 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
  
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
  F:    drivers/media/i2c/imx412.c
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0303-staging-vc04_services-ISP-Add-a-more-complex-ISP-pro.patch b/target/linux/bcm27xx/patches-5.15/950-0303-staging-vc04_services-ISP-Add-a-more-complex-ISP-pro.patch
index 3f9149ed1575d43464384879f6d07dcb1a964eef..d1dc2613b9cbd3afc7a22c33af159b8c0e4d05cc 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0303-staging-vc04_services-ISP-Add-a-more-complex-ISP-pro.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0303-staging-vc04_services-ISP-Add-a-more-complex-ISP-pro.patch
@@ -35,7 +35,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 
 --- 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
  
  F:    drivers/media/platform/bcm2835/
  F:    Documentation/devicetree/bindings/media/brcm,bcm2835-unicam.yaml
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch b/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch
index f21349769cdf7d3653c9b58c45fe6c18a7608b04..d60c0f372cc50c8737d249eddac076ed6c353eb2 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch
@@ -132,7 +132,7 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
 +...
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 +...
 --- 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
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git

diff --git a/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch b/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch
index 0107f0dc0e603859163e87128a8648d2a78be5e0..b1af6872fbfda1745a3dcc43278e6c458fac1c36 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch
@@ -132,7 +132,7 @@ Signed-off-by: Lee Jackson <info@arducam.com>
 +...
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 +...
 --- 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
  
  F:    Documentation/devicetree/bindings/media/i2c/imx477.yaml
  F:    drivers/media/i2c/imx477.c
  

diff --git a/target/linux/bcm27xx/patches-5.15/950-0623-drm-edid-Rename-drm_hdmi_avi_infoframe_colorspace-to.patch b/target/linux/bcm27xx/patches-5.15/950-0623-drm-edid-Rename-drm_hdmi_avi_infoframe_colorspace-to.patch
index a0f4963c414a2a4e5fcf17e4f00942687a38558b..de80fe4628f23e8965e77675cbf6696aeb41ad86 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0623-drm-edid-Rename-drm_hdmi_avi_infoframe_colorspace-to.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0623-drm-edid-Rename-drm_hdmi_avi_infoframe_colorspace-to.patch
@@ -26,7 +26,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/gpu/drm/drm_edid.c
 +++ b/drivers/gpu/drm/drm_edid.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
  
  /**
  #undef ACE
  
  /**


@@ -43,7 +43,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                                  const struct drm_connector_state *conn_state)
  {
        u32 colorimetry_val;
                                  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;
  }
        frame->extended_colorimetry = (colorimetry_val >> 2) &
                                        EXTENDED_COLORIMETRY_MASK;
  }

diff --git a/target/linux/bcm27xx/patches-5.15/950-0795-drm-tiny-Add-MIPI-DBI-compatible-SPI-driver.patch b/target/linux/bcm27xx/patches-5.15/950-0795-drm-tiny-Add-MIPI-DBI-compatible-SPI-driver.patch
index 442e10add259f322d1e3d77a98136150d28f3279..8f5d167b4c8c304bdb9d8eee002ebd23527f1a7e 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0795-drm-tiny-Add-MIPI-DBI-compatible-SPI-driver.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0795-drm-tiny-Add-MIPI-DBI-compatible-SPI-driver.patch
@@ -63,7 +63,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20220227124713.39766-6-noral
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 
 --- 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
  
  F:    Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt
  F:    drivers/gpu/drm/tiny/mi0283qt.c
  

diff --git a/target/linux/bcm47xx/patches-5.15/105-v5.18-mtd-rawnand-brcmnand-Add-platform-data-structure-for-BCMA.patch b/target/linux/bcm47xx/patches-5.15/105-v5.18-mtd-rawnand-brcmnand-Add-platform-data-structure-for-BCMA.patch
index ab53cfd6e9f326046cfdcfd2c5278971f90476b5..56c686f3083b64d83e5881460c91805ac98df2fd 100644 (file)
--- a/target/linux/bcm47xx/patches-5.15/105-v5.18-mtd-rawnand-brcmnand-Add-platform-data-structure-for-BCMA.patch
+++ b/target/linux/bcm47xx/patches-5.15/105-v5.18-mtd-rawnand-brcmnand-Add-platform-data-structure-for-BCMA.patch
@@ -20,7 +20,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 
 --- 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/
  L:    bcm-kernel-feedback-list@broadcom.com
  S:    Maintained
  F:    drivers/mtd/nand/raw/brcmnand/

diff --git a/target/linux/bcm4908/patches-5.15/080-v5.18-0001-dt-bindings-pinctrl-Add-binding-for-BCM4908-pinctrl.patch b/target/linux/bcm4908/patches-5.15/080-v5.18-0001-dt-bindings-pinctrl-Add-binding-for-BCM4908-pinctrl.patch
index 946bc79b60323e7fe64f2898d8edba07acd10753..adc7d6bb0c5cdcad2ae2adea0140da8ac6df1368 100644 (file)
--- a/target/linux/bcm4908/patches-5.15/080-v5.18-0001-dt-bindings-pinctrl-Add-binding-for-BCM4908-pinctrl.patch
+++ b/target/linux/bcm4908/patches-5.15/080-v5.18-0001-dt-bindings-pinctrl-Add-binding-for-BCM4908-pinctrl.patch
@@ -95,7 +95,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
 +    };
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 +    };
 --- 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
  
  F:    drivers/net/ethernet/broadcom/bcm4908_enet.*
  F:    drivers/net/ethernet/broadcom/unimac.h
  

diff --git a/target/linux/bcm4908/patches-5.15/080-v5.18-0002-pinctrl-bcm-add-driver-for-BCM4908-pinmux.patch b/target/linux/bcm4908/patches-5.15/080-v5.18-0002-pinctrl-bcm-add-driver-for-BCM4908-pinmux.patch
index 5bd380f67a6e6db81d96d84966c984e9a807db4b..7e7dccb6f6edcd5c0d17c4b607e1da4be599d0d2 100644 (file)
--- a/target/linux/bcm4908/patches-5.15/080-v5.18-0002-pinctrl-bcm-add-driver-for-BCM4908-pinmux.patch
+++ b/target/linux/bcm4908/patches-5.15/080-v5.18-0002-pinctrl-bcm-add-driver-for-BCM4908-pinmux.patch
@@ -23,7 +23,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 
 --- 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
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml

diff --git a/target/linux/generic/backport-5.15/050-v5.16-05-mips-bpf-Enable-eBPF-JITs.patch b/target/linux/generic/backport-5.15/050-v5.16-05-mips-bpf-Enable-eBPF-JITs.patch
index 41b3d8139fd3c824fdf3a9a29841969ccdc333ac..14763c1211ea5e8623eaad7a409cf61e1ebfb384 100644 (file)
--- a/target/linux/generic/backport-5.15/050-v5.16-05-mips-bpf-Enable-eBPF-JITs.patch
+++ b/target/linux/generic/backport-5.15/050-v5.16-05-mips-bpf-Enable-eBPF-JITs.patch
@@ -14,7 +14,7 @@ Signed-off-by: Johan Almbladh <johan.almbladh@anyfinetworks.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 
 --- 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)
  F:    arch/arm64/net/
  
  BPF JIT for MIPS (32-BIT AND 64-BIT)

diff --git a/target/linux/generic/backport-5.15/804-v5.18-0009-nvmem-Add-driver-for-OCOTP-in-Sunplus-SP7021.patch b/target/linux/generic/backport-5.15/804-v5.18-0009-nvmem-Add-driver-for-OCOTP-in-Sunplus-SP7021.patch
index 07c5808403b7e7ada7f3085dd491554fda013432..a4c1b66c9e3ec9e8be3d1c2f36a9b0bd7da20b9a 100644 (file)
--- a/target/linux/generic/backport-5.15/804-v5.18-0009-nvmem-Add-driver-for-OCOTP-in-Sunplus-SP7021.patch
+++ b/target/linux/generic/backport-5.15/804-v5.18-0009-nvmem-Add-driver-for-OCOTP-in-Sunplus-SP7021.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 
 --- 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
  
  S:    Maintained
  F:    drivers/net/ethernet/dlink/sundance.c
  

diff --git a/target/linux/generic/backport-5.15/806-v6.0-0001-nvmem-microchip-otpc-add-support.patch b/target/linux/generic/backport-5.15/806-v6.0-0001-nvmem-microchip-otpc-add-support.patch
index eeffbdaf5274b9a983e9c1ae67efefac3def4010..6503c7aa3b1430a91ce70bdd5b028504e67d8029 100644 (file)
--- a/target/linux/generic/backport-5.15/806-v6.0-0001-nvmem-microchip-otpc-add-support.patch
+++ b/target/linux/generic/backport-5.15/806-v6.0-0001-nvmem-microchip-otpc-add-support.patch
@@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 
 --- 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/*
  
  F:    Documentation/devicetree/bindings/mtd/atmel-nand.txt
  F:    drivers/mtd/nand/raw/atmel/*
  

diff --git a/target/linux/generic/hack-5.15/204-module_strip.patch b/target/linux/generic/hack-5.15/204-module_strip.patch
index 979daa4727eb8904f79c95dd21d5c064423341ef..dd5d93e22673e710e0966798802c2a2096639fe2 100644 (file)
--- a/target/linux/generic/hack-5.15/204-module_strip.patch
+++ b/target/linux/generic/hack-5.15/204-module_strip.patch
@@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 --- a/init/Kconfig
 +++ b/init/Kconfig
  
 --- 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.
  
          one per line. The path can be absolute, or relative to the kernel
          source tree.
  

diff --git a/target/linux/generic/hack-5.15/253-ksmbd-config.patch b/target/linux/generic/hack-5.15/253-ksmbd-config.patch
index a29cf3bf617cac586ab0fe7bce02848f92ee2bb1..b8cb94f62bc0a832807ea78b353c568fc72b9388 100644 (file)
--- a/target/linux/generic/hack-5.15/253-ksmbd-config.patch
+++ b/target/linux/generic/hack-5.15/253-ksmbd-config.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] Kconfig: add tristate for OID and ASNI string
 
 --- a/init/Kconfig
 +++ b/init/Kconfig
 
 --- a/init/Kconfig
 +++ b/init/Kconfig

-@@ -2384,7 +2384,7 @@ config PADATA
+@@ -2388,7 +2388,7 @@ config PADATA

        bool
  
  config ASN1
        bool
  
  config ASN1

diff --git a/target/linux/generic/pending-5.15/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-5.15/203-kallsyms_uncompressed.patch
index b525976fc9635bb2a833ea58a37f13164168ccdf..930d0ff0fe426d50bc796e44905b2ea42e9cbc3e 100644 (file)
--- a/target/linux/generic/pending-5.15/203-kallsyms_uncompressed.patch
+++ b/target/linux/generic/pending-5.15/203-kallsyms_uncompressed.patch
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/init/Kconfig
 +++ b/init/Kconfig
 
 --- 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
  
          the unaligned access emulation.
          see arch/parisc/kernel/unaligned.c for reference
  

diff --git a/target/linux/generic/pending-5.15/920-mangle_bootargs.patch b/target/linux/generic/pending-5.15/920-mangle_bootargs.patch
index 2a02efe0aa989f4756d01c12e3b9198fa81c32fa..5f0a106ae4e9d81c1bac5486f506759d5cf0dd91 100644 (file)
--- a/target/linux/generic/pending-5.15/920-mangle_bootargs.patch
+++ b/target/linux/generic/pending-5.15/920-mangle_bootargs.patch
@@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 
 --- a/init/Kconfig
 +++ b/init/Kconfig
 
 --- 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.
  
          an embedded system so certain expert options are available
          for configuration.
  

diff --git a/target/linux/layerscape/patches-5.15/701-staging-add-fsl_ppfe-driver.patch b/target/linux/layerscape/patches-5.15/701-staging-add-fsl_ppfe-driver.patch
index 00c8e869beb5a31ec0a23e8f24af30135fc118df..784c13085d7f95b4b5faaa80f51861edcb2093d4 100644 (file)
--- a/target/linux/layerscape/patches-5.15/701-staging-add-fsl_ppfe-driver.patch
+++ b/target/linux/layerscape/patches-5.15/701-staging-add-fsl_ppfe-driver.patch
@@ -854,7 +854,7 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
 +};
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 +};
 --- 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
  
  F:    drivers/ptp/ptp_qoriq_debugfs.c
  F:    include/linux/fsl/ptp_qoriq.h
  

diff --git a/target/linux/mvebu/patches-5.15/907-MAINTAINERS-Add-an-entry-for-the-IEI-WT61P803-PUZZLE.patch b/target/linux/mvebu/patches-5.15/907-MAINTAINERS-Add-an-entry-for-the-IEI-WT61P803-PUZZLE.patch
index b8accf180bb0053eb5e95da099bcc1da4a14076c..7d27ae2e997e6483f8ac121f8c31cb9add599509 100644 (file)
--- a/target/linux/mvebu/patches-5.15/907-MAINTAINERS-Add-an-entry-for-the-IEI-WT61P803-PUZZLE.patch
+++ b/target/linux/mvebu/patches-5.15/907-MAINTAINERS-Add-an-entry-for-the-IEI-WT61P803-PUZZLE.patch
@@ -16,7 +16,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 
 --- 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/
  
  F:    net/ieee802154/
  F:    net/mac802154/
  

diff --git a/target/linux/realtek/patches-5.15/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch b/target/linux/realtek/patches-5.15/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch
index 794cdfa37a1340db77db84624f12d55a42d1c83f..93f0fe5cf475dc9ec2f2f679d22548c94a558416 100644 (file)
--- a/target/linux/realtek/patches-5.15/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch
+++ b/target/linux/realtek/patches-5.15/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch
@@ -32,7 +32,7 @@ Signed-off-by: Guenter Roeck <linux@roeck-us.net>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 
 --- 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*
  
  F:    include/sound/rt*.h
  F:    sound/soc/codecs/rt*