diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index f14160a5dbea..4ba977c87bdd 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -31,7 +31,7 @@ case $BRANCH in current) declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.12.47" + declare -g KERNELBRANCH="tag:v6.12.57" ;; edge) diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index 8a0dc4047870..9bd0c9a55f98 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -32,7 +32,7 @@ case $BRANCH in current) declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.12.51" + declare -g KERNELBRANCH="tag:v6.12.57" ;; edge) diff --git a/patch/kernel/archive/sunxi-6.12/series.armbian b/patch/kernel/archive/sunxi-6.12/series.armbian index 64e963ef9c64..935e9b41ccaf 100644 --- a/patch/kernel/archive/sunxi-6.12/series.armbian +++ b/patch/kernel/archive/sunxi-6.12/series.armbian @@ -34,7 +34,7 @@ patches.armbian/drv-gpu-drm-panel-simple-Add-compability-olinuxino-lcd.patch patches.armbian/drv-input-touchscreen-sun4i-ts-Enable-parsing.patch patches.armbian/drv-mmc-host-sunxi-mmc-Disable-DDR52-mode-on-all-A20-based-boar.patch - patches.armbian/drv-usb-gadget-composite-rename-gadget-serial-console-manufactu.patch +- patches.armbian/drv-usb-gadget-composite-rename-gadget-serial-console-manufactu.patch patches.armbian/Add-FB_TFT-ST7796S-driver.patch patches.armbian/Optimize-TSC2007-touchscreen-add-polling-method.patch patches.armbian/Add-ws2812-RGB-driver-for-allwinner-H616.patch diff --git a/patch/kernel/archive/sunxi-6.12/series.conf b/patch/kernel/archive/sunxi-6.12/series.conf index b64dc7954d38..29d05498fff8 100644 --- a/patch/kernel/archive/sunxi-6.12/series.conf +++ b/patch/kernel/archive/sunxi-6.12/series.conf @@ -173,7 +173,7 @@ patches.megous/arm64-dts-allwinner-Enforce-consistent-MMC-numbering.patch patches.megous/ARM-dts-sunxi-Add-aliases-for-MMC.patch patches.megous/drm-rockchip-Fix-panic-on-reboot-when-DRM-device-fails-to-bind.patch - patches.megous/usb-gadget-Fix-dangling-pointer-in-netdev-private-data.patch +- patches.megous/usb-gadget-Fix-dangling-pointer-in-netdev-private-data.patch patches.megous/mmc-dw-mmc-rockchip-fix-sdmmc-after-soft-reboot.patch patches.megous/Revert-drm-sun4i-lvds-Invert-the-LVDS-polarity.patch patches.megous/of-property-fw_devlink-Support-allwinner-sram-links.patch diff --git a/patch/kernel/archive/sunxi-6.12/series.megous b/patch/kernel/archive/sunxi-6.12/series.megous index ee4491ed87a8..f8c3dbeba166 100644 --- a/patch/kernel/archive/sunxi-6.12/series.megous +++ b/patch/kernel/archive/sunxi-6.12/series.megous @@ -172,7 +172,7 @@ patches.megous/arm64-dts-allwinner-Enforce-consistent-MMC-numbering.patch patches.megous/ARM-dts-sunxi-Add-aliases-for-MMC.patch patches.megous/drm-rockchip-Fix-panic-on-reboot-when-DRM-device-fails-to-bind.patch - patches.megous/usb-gadget-Fix-dangling-pointer-in-netdev-private-data.patch +- patches.megous/usb-gadget-Fix-dangling-pointer-in-netdev-private-data.patch patches.megous/mmc-dw-mmc-rockchip-fix-sdmmc-after-soft-reboot.patch patches.megous/Revert-drm-sun4i-lvds-Invert-the-LVDS-polarity.patch patches.megous/of-property-fw_devlink-Support-allwinner-sram-links.patch