From 897674aa74bce0326ed7fe06f5336bf4709a8a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?=
 <igorpecovnik@users.noreply.github.com>
Date: Tue, 3 May 2022 08:27:32 +0200
Subject: [PATCH] Bump and freeze kernel at last known working versions (#3736)

* Freeze kernel at last known working versions

* Fix media kernel

* Update rockchip64 to 5.17.y

* Move patches up

* Re-ad aufs

* Fix rpi kernels
---
 config/kernel/linux-bcm2711-current.config    |  26 +-
 config/kernel/linux-bcm2711-edge.config       |   2 +-
 config/kernel/linux-imx6-current.config       |   7 +-
 config/kernel/linux-rockchip64-edge.config    | 222 ++++++++++++------
 config/sources/families/bcm2711.conf          |   2 +
 .../families/include/meson64_common.inc       |   6 +-
 .../families/include/rockchip64_common.inc    |   4 +-
 .../families/include/sunxi64_common.inc       |  17 +-
 .../sources/families/include/sunxi_common.inc |  17 +-
 config/sources/families/jetson-nano.conf      |   3 +-
 config/sources/families/media.conf            |   6 +-
 config/sources/families/mvebu.conf            |   2 +
 config/sources/families/mvebu64.conf          |   2 +
 config/sources/families/odroidxu4.conf        |   2 +-
 config/sources/families/rk322x.conf           |   3 +-
 config/sources/families/rk35xx.conf           |  12 +-
 config/sources/families/rockchip.conf         |   3 +-
 config/sources/families/virtual.conf          |   2 +
 lib/compilation-prepare.sh                    |   3 +-
 .../general-btsdio-ignore-uart-devs.patch     |  19 --
 ...e-net-ipx.h-and-uapi-linux-ipx.h-hea.patch |   0
 .../add-board-Z28-PRO-as-link-to-Rock64.patch |   0
 .../add-board-helios64.patch                  |   0
 .../add-board-nanopi-m4v2.patch               |   0
 .../add-board-nanopi-r2c.patch                |   0
 .../add-board-nanopi-r2s.patch                |   0
 .../add-board-nanopi-r4s.patch                |   0
 .../add-board-orangepi-4.patch                |   0
 .../add-board-orangepi-r1plus.patch           |   0
 ...dd-board-rk3328-roc-pc-as-station-m1.patch |   0
 .../add-board-rk3399-roc-pc-plus.patch        |   0
 .../add-board-tinker-board-2.patch            |   0
 ...nopi-Neo3-with-enabled-I2S-and-spdif.patch |   0
 .../add-boards-to-dts-makefile.patch          |   0
 .../add-csgpio-to-rockchip-spi.patch          |   0
 ...add-driver-for-Motorcomm-YT85xx+PHYs.patch |   0
 .../add-fusb30x-driver.patch                  |   0
 .../add-maker-friendlyarm.patch               |   0
 .../add-rk3328-usb3-phy-driver.patch          |   0
 .../add-rockchip-iep-driver.patch             |   0
 .../board-firefly-rk3399-dts.patch            |   0
 ...rd-helios64-dts-fix-stability-issues.patch |   0
 .../board-helios64-remove-overclock.patch     |   0
 .../board-helios64-remove-pcie-ep-gpios.patch |   0
 .../board-nanopc-t4-add-typec-dp.patch        |   0
 ...board-nanopi-m4v2-dts-add-sound-card.patch |   0
 ...board-nanopi-m4v2-dts-ethernet-tweak.patch |   0
 ...nanopi-m4v2-dts-fix-stability-issues.patch |   0
 ...oard-nanopi-r2s-r8152-customise-leds.patch |   0
 .../board-nanopi-r2s-r8152-mac-from-dt.patch  |   0
 .../board-pbp-add-dp-alt-mode.patch           |   0
 .../board-pbp-add-dp-alt-mode.patch.disabled  |   0
 .../board-pbp-add-suspend.patch               |   0
 .../board-pbp-fix-wonky-wifi-bt.patch         |   0
 .../board-renegade-dts-cleanup.patch.dis      |   0
 .../board-rk3328-roc-cc-dts-enable-dmc.patch  |   0
 .../board-rk3328-roc-cc-dts-ram-profile.patch |   0
 .../board-rk3328-roc-cc-rock64-add-usb3.patch |   0
 .../board-rk3328-roc-pc-dts-enable-dmc.patch  |   0
 .../board-rk3328-roc-pc-dts-ram-profile.patch |   0
 ...roc-rk3399-pc-fix-fusb302-compatible.patch |   0
 .../board-rock64-mail-supply.patch            |   0
 ...ckpi4-0001-arm64-dts-audio-over-hdmi.patch |   0
 .../board-rockpi4-0002-arm64-dts-leds.patch   |   0
 .../board-rockpi4-0003-arm64-dts-pcie.patch   |   0
 ...d-DT-link-for-backward-compatibility.patch |   0
 .../board-rockpi4-FixMMCFreq.patch            |   0
 .../board-rockpi4c-add-minidp.patch.WIP       |   0
 ...s-rockchip-add-ROCK-Pi-S-DTS-support.patch |   0
 ...-0002-Fixes-for-rk3308-rock-pi-s-dts.patch |   0
 ...rd-rockpis-0003-WIP-Wireless-support.patch |   0
 ...s-rk3308-Add-gmac-node-at-dtsi-level.patch |   0
 ...ip-Enable-mac-node-on-rk3308-rock-pi.patch |   0
 ...ip-add-cpu-s-thermal-config-for-rk33.patch |   0
 ...ockchip-add-tsadc-support-for-rk3308.patch |   0
 ...ip-Enable-tsadc-node-on-rk3308-rock-.patch |   0
 ...-dts-rockchip-add-i2s_8ch-for-rk3308.patch |   0
 ...ip-Set-is2_8ch-clocks-on-rk3308-rock.patch |   0
 ...12-arm64-dts-rk3308-Add-rk-timer-rtc.patch |   0
 ...d-rockpis-0013-Add-simple-audio-card.patch |   0
 ...ip-Move-wireless-wlan-node-into-sdio.patch |   0
 ...ecs-Add-RK3308-internal-codec-driver.patch |   0
 ...s-0019-Sync-rk3308_codec-to-BSP-tree.patch |   0
 ...-rockchip-Add-acodec-node-for-rk3308.patch |   0
 ...ip-enable-analog-audio-node-for-rk33.patch |   0
 ...308_codec-replace-codec-to-component.patch |   0
 ...24-add-uart2-for-debug-rock-pi-s-dts.patch |   0
 ...rd-rockpis-0026-add-usb-host-otg-dts.patch |   0
 ...027-arm64-dts-rk3308-add-otp-cpuinfo.patch |   0
 ...028-arm64-dts-rk3308-add-opp-1300mhz.patch |   0
 ...s-rk3308-add-reserved-memory-ramoops.patch |   0
 ...s-0030-disabled-emmc-fix-boot-sdcard.patch |   0
 ...99-rockpro64-Add-pcie-bus-scan-delay.patch |   0
 ...d-rockpro64-change-rx_delay-for-gmac.patch |   0
 .../board-rockpro64-fix-emmc.patch            |   0
 ...board-rockpro64-fix-spi1-flash-speed.patch |   0
 .../board-rockpro64-work-led-heartbeat.patch  |   0
 .../general-add-dwc3-xhci-usb-trb-quirk.patch |   0
 .../general-add-miniDP-dt-doc.patch           |   0
 .../general-add-miniDP-virtual-extcon.patch   |   0
 ...eral-add-overlay-compilation-support.patch |   0
 .../general-add-overlay-configfs.patch        |   0
 .../general-add-panel-simple-dsi.patch        |   0
 .../general-add-pll-hdmi-timings.patch        |   0
 .../general-add-xtx-spi-nor-chips.patch       |   4 +-
 ...uetooth-02-add-support-for-RTL8723CS.patch |   0
 ...ooth-03-hci_h5-add-binding-RTL8723CS.patch |   0
 .../general-bluetooth-04-add-rtl8703bs.patch  |   0
 .../general-bluetooth-add-new-quirk.patch     |   0
 .../general-disable-mtu-validation.patch      |   0
 .../general-emmc-hs400es-init-tweak.patch     |   0
 ...neral-enhance-backport-es8328-driver.patch |   0
 .../general-fix-es8316-kernel-panic.patch     |   0
 ...fix-mmc-signal-voltage-before-reboot.patch |   0
 ..._DMA_block_memory_allocation_to_2048.patch |   0
 ...l-possibility-of-disabling-rk808-rtc.patch |   0
 ...08-configurable-switch-voltage-steps.patch |   0
 .../general-rockchip-overlays.patch           |   0
 .../general-rt5651-add-mclk.patch             |   0
 ...eneral-workaround-broadcom-bt-serdev.patch |   0
 ...IP-Sync-rockchip_i2s_tdm-to-BSP-tree.patch |   0
 ...ckchip-i2s-add-compatible-for-rk3308.patch |   0
 .../rk3328-gpu-opp-adjust-DMC.patch           |   0
 .../overlays-00-add-oc-opp-rk3399.patch       |   0
 .../overlays-01-add-oc-opp-rk3328.patch       |   0
 .../regulator-add-fan53200-driver.patch       |   0
 ...k3328-add-board-orangepi-r1-plus-lts.patch |   0
 .../rk3328-add-dmc-driver.patch               |   4 +-
 .../rk3328-add-rga-node.patch                 |   0
 .../rk3328-dts-roc-cc-audio-supplies.patch    |   0
 .../rk3328-dtsi-add-rkvdec-node.patch         |   0
 .../rk3328-dtsi-mali-opp-table.patch          |   0
 .../rk3328-dtsi-mmc-reset-properties.patch    |   0
 .../rk3328-dtsi-sdmmc-ext-node.patch          |   0
 .../rk3328-dtsi-spdif.patch                   |   0
 .../rk3328-dtsi-usb3-reset-properties.patch   |   0
 .../rk3328-gpu-cooling-target.patch           |   0
 .../rk3399-add-sclk-i2sout-src-clock.patch    |   0
 ...k3399-enable-dwc3-xhci-usb-trb-quirk.patch |   0
 ...kchip-support-ep-gpio-undefined-case.patch |   0
 ...plement-rockchip-PCIe-bus-scan-delay.patch |   0
 .../rk3399-sd-drive-level-8ma.patch           |   0
 .../rk3399-unlock-temperature.patch           |   0
 ...-add-realtek-8723cs-kconfig-makefile.patch |   0
 .../wifi-4002-add-realtek-8723cs.patch        |   0
 ...k-8723cs-Fix-IEEE80211_MAX_AMPDU_BUF.patch |   0
 ...ifi-hf-lps170-bl602-kconfig-makefile.patch |   0
 .../wifi-hf-lps170-bl602.patch                |   0
 ...proper-adjustement-for-reading-MAC-f.patch |   0
 patch/kernel/rockchip64-edge                  |   2 +-
 150 files changed, 233 insertions(+), 137 deletions(-)
 delete mode 100644 patch/kernel/archive/rockchip64-5.16/general-btsdio-ignore-uart-devs.patch
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/0001-Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-hea.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-board-Z28-PRO-as-link-to-Rock64.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-board-helios64.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-board-nanopi-m4v2.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-board-nanopi-r2c.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-board-nanopi-r2s.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-board-nanopi-r4s.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-board-orangepi-4.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-board-orangepi-r1plus.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-board-rk3328-roc-pc-as-station-m1.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-board-rk3399-roc-pc-plus.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-board-tinker-board-2.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-board-xxx-nanopi-Neo3-with-enabled-I2S-and-spdif.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-boards-to-dts-makefile.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-csgpio-to-rockchip-spi.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-driver-for-Motorcomm-YT85xx+PHYs.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-fusb30x-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-maker-friendlyarm.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-rk3328-usb3-phy-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/add-rockchip-iep-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-firefly-rk3399-dts.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-helios64-dts-fix-stability-issues.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-helios64-remove-overclock.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-helios64-remove-pcie-ep-gpios.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-nanopc-t4-add-typec-dp.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-nanopi-m4v2-dts-add-sound-card.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-nanopi-m4v2-dts-ethernet-tweak.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-nanopi-m4v2-dts-fix-stability-issues.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-nanopi-r2s-r8152-customise-leds.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-nanopi-r2s-r8152-mac-from-dt.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-pbp-add-dp-alt-mode.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-pbp-add-dp-alt-mode.patch.disabled (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-pbp-add-suspend.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-pbp-fix-wonky-wifi-bt.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-renegade-dts-cleanup.patch.dis (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rk3328-roc-cc-dts-enable-dmc.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rk3328-roc-cc-dts-ram-profile.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rk3328-roc-cc-rock64-add-usb3.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rk3328-roc-pc-dts-enable-dmc.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rk3328-roc-pc-dts-ram-profile.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-roc-rk3399-pc-fix-fusb302-compatible.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rock64-mail-supply.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpi4-0001-arm64-dts-audio-over-hdmi.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpi4-0002-arm64-dts-leds.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpi4-0003-arm64-dts-pcie.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpi4-Add-DT-link-for-backward-compatibility.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpi4-FixMMCFreq.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpi4c-add-minidp.patch.WIP (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0001-arm64-dts-rockchip-add-ROCK-Pi-S-DTS-support.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0002-Fixes-for-rk3308-rock-pi-s-dts.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0003-WIP-Wireless-support.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0006-arm64-dts-rockchip-Enable-mac-node-on-rk3308-rock-pi.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0009-arm64-dts-rockchip-Enable-tsadc-node-on-rk3308-rock-.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0011-arm64-dts-rockchip-Set-is2_8ch-clocks-on-rk3308-rock.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0013-Add-simple-audio-card.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0015-arm64-dts-rockchip-Move-wireless-wlan-node-into-sdio.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0021-arm64-dts-rockchip-enable-analog-audio-node-for-rk33.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0024-add-uart2-for-debug-rock-pi-s-dts.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0026-add-usb-host-otg-dts.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0028-arm64-dts-rk3308-add-opp-1300mhz.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0030-disabled-emmc-fix-boot-sdcard.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpis-0031-arm64-dts-rk3399-rockpro64-Add-pcie-bus-scan-delay.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpro64-change-rx_delay-for-gmac.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpro64-fix-emmc.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpro64-fix-spi1-flash-speed.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/board-rockpro64-work-led-heartbeat.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-add-dwc3-xhci-usb-trb-quirk.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-add-miniDP-dt-doc.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-add-miniDP-virtual-extcon.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-add-overlay-compilation-support.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-add-overlay-configfs.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-add-panel-simple-dsi.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-add-pll-hdmi-timings.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-add-xtx-spi-nor-chips.patch (95%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-bluetooth-02-add-support-for-RTL8723CS.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-bluetooth-03-hci_h5-add-binding-RTL8723CS.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-bluetooth-04-add-rtl8703bs.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-bluetooth-add-new-quirk.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-disable-mtu-validation.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-emmc-hs400es-init-tweak.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-enhance-backport-es8328-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-fix-es8316-kernel-panic.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-fix-mmc-signal-voltage-before-reboot.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-increasing_DMA_block_memory_allocation_to_2048.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-possibility-of-disabling-rk808-rtc.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-rk808-configurable-switch-voltage-steps.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-rockchip-overlays.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-rt5651-add-mclk.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/general-workaround-broadcom-bt-serdev.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/need_checking/board-rockpis-0017-WIP-Sync-rockchip_i2s_tdm-to-BSP-tree.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/need_checking/board-rockpis-0023-ASoC-rockchip-i2s-add-compatible-for-rk3308.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/need_checking/rk3328-gpu-opp-adjust-DMC.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/overlays-00-add-oc-opp-rk3399.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/overlays-01-add-oc-opp-rk3328.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/regulator-add-fan53200-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3328-add-board-orangepi-r1-plus-lts.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3328-add-dmc-driver.patch (99%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3328-add-rga-node.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3328-dts-roc-cc-audio-supplies.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3328-dtsi-add-rkvdec-node.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3328-dtsi-mali-opp-table.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3328-dtsi-mmc-reset-properties.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3328-dtsi-sdmmc-ext-node.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3328-dtsi-spdif.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3328-dtsi-usb3-reset-properties.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3328-gpu-cooling-target.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3399-add-sclk-i2sout-src-clock.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3399-pci-rockchip-support-ep-gpio-undefined-case.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3399-sd-drive-level-8ma.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/rk3399-unlock-temperature.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/wifi-4001-add-realtek-8723cs-kconfig-makefile.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/wifi-4002-add-realtek-8723cs.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/wifi-4002-realtek-8723cs-Fix-IEEE80211_MAX_AMPDU_BUF.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/wifi-hf-lps170-bl602-kconfig-makefile.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/wifi-hf-lps170-bl602.patch (100%)
 rename patch/kernel/archive/{rockchip64-5.16 => rockchip64-5.17}/workaround-need-proper-adjustement-for-reading-MAC-f.patch (100%)

diff --git a/config/kernel/linux-bcm2711-current.config b/config/kernel/linux-bcm2711-current.config
index 5a6da48588..8ec07df6c6 100644
--- a/config/kernel/linux-bcm2711-current.config
+++ b/config/kernel/linux-bcm2711-current.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.24 Kernel Configuration
+# Linux/arm64 5.15.36 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -396,7 +396,6 @@ CONFIG_HZ=250
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 # CONFIG_KEXEC_FILE is not set
@@ -404,6 +403,7 @@ CONFIG_PARAVIRT=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
@@ -679,7 +679,6 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 
 #
@@ -2072,7 +2071,6 @@ CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
@@ -2503,8 +2501,6 @@ CONFIG_BCMGENET=y
 # CONFIG_BNX2X is not set
 # CONFIG_SYSTEMPORT is not set
 # CONFIG_BNXT is not set
-CONFIG_NET_VENDOR_BROCADE=y
-# CONFIG_BNA is not set
 CONFIG_NET_VENDOR_CADENCE=y
 # CONFIG_MACB is not set
 CONFIG_NET_VENDOR_CAVIUM=y
@@ -2559,7 +2555,6 @@ CONFIG_NET_VENDOR_INTEL=y
 # CONFIG_ICE is not set
 # CONFIG_FM10K is not set
 # CONFIG_IGC is not set
-CONFIG_NET_VENDOR_MICROSOFT=y
 # CONFIG_JME is not set
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -2585,9 +2580,12 @@ CONFIG_ENC28J60=m
 # CONFIG_ENCX24J600 is not set
 # CONFIG_LAN743X is not set
 CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 # CONFIG_MYRI10GE is not set
 # CONFIG_FEALNX is not set
+CONFIG_NET_VENDOR_NI=y
+# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 # CONFIG_NATSEMI is not set
 # CONFIG_NS83820 is not set
@@ -2596,8 +2594,6 @@ CONFIG_NET_VENDOR_NETERION=y
 # CONFIG_VXGE is not set
 CONFIG_NET_VENDOR_NETRONOME=y
 # CONFIG_NFP is not set
-CONFIG_NET_VENDOR_NI=y
-# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_8390=y
 # CONFIG_NE2K_PCI is not set
 CONFIG_NET_VENDOR_NVIDIA=y
@@ -2614,6 +2610,8 @@ CONFIG_NET_VENDOR_QLOGIC=y
 # CONFIG_QLCNIC is not set
 # CONFIG_NETXEN_NIC is not set
 # CONFIG_QED is not set
+CONFIG_NET_VENDOR_BROCADE=y
+# CONFIG_BNA is not set
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
@@ -2631,14 +2629,14 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SAMSUNG=y
 # CONFIG_SXGBE_ETH is not set
 CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SOLARFLARE=y
-# CONFIG_SFC is not set
-# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SILAN=y
 # CONFIG_SC92031 is not set
 CONFIG_NET_VENDOR_SIS=y
 # CONFIG_SIS900 is not set
 # CONFIG_SIS190 is not set
+CONFIG_NET_VENDOR_SOLARFLARE=y
+# CONFIG_SFC is not set
+# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_SMC91X is not set
 # CONFIG_EPIC100 is not set
@@ -3403,7 +3401,6 @@ CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_BCM2835=y
 CONFIG_HW_RANDOM_IPROC_RNG200=y
 CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_CAVIUM=y
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_HW_RANDOM_XIPHERA is not set
 CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
@@ -4729,6 +4726,7 @@ CONFIG_VIDEO_IMX335=m
 CONFIG_VIDEO_IMX412=m
 CONFIG_VIDEO_IMX519=m
 CONFIG_VIDEO_OV02A10=m
+CONFIG_VIDEO_OV2311=m
 # CONFIG_VIDEO_OV2640 is not set
 # CONFIG_VIDEO_OV2659 is not set
 # CONFIG_VIDEO_OV2680 is not set
@@ -4783,6 +4781,7 @@ CONFIG_VIDEO_S5C73M3=m
 #
 # Lens drivers
 #
+CONFIG_VIDEO_AD5398=m
 # CONFIG_VIDEO_AD5820 is not set
 # CONFIG_VIDEO_AK7375 is not set
 # CONFIG_VIDEO_DW9714 is not set
@@ -5202,6 +5201,7 @@ CONFIG_DRM_VC4_HDMI_CEC=y
 # CONFIG_DRM_BOCHS is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_GM12U320 is not set
+CONFIG_DRM_PANEL_MIPI_DBI=m
 CONFIG_DRM_SIMPLEDRM=m
 # CONFIG_TINYDRM_HX8357D is not set
 CONFIG_TINYDRM_ILI9225=m
diff --git a/config/kernel/linux-bcm2711-edge.config b/config/kernel/linux-bcm2711-edge.config
index 69e7599032..4dbe067327 100644
--- a/config/kernel/linux-bcm2711-edge.config
+++ b/config/kernel/linux-bcm2711-edge.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.17.3 Kernel Configuration
+# Linux/arm64 5.17.4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/kernel/linux-imx6-current.config b/config/kernel/linux-imx6-current.config
index 1a0ba2331a..35df1864c6 100644
--- a/config/kernel/linux-imx6-current.config
+++ b/config/kernel/linux-imx6-current.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.15.25 Kernel Configuration
+# Linux/arm 5.15.32 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -553,6 +553,7 @@ CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_CPU_SPECTRE=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
+CONFIG_HARDEN_BRANCH_HISTORY=y
 CONFIG_KUSER_HELPERS=y
 # CONFIG_VDSO is not set
 CONFIG_OUTER_CACHE=y
@@ -2234,6 +2235,7 @@ CONFIG_DEBUG_DEVRES=y
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_AC97=m
@@ -2515,7 +2517,6 @@ CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
@@ -10008,7 +10009,7 @@ CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
-CONFIG_F2FS_FS_COMPRESSION=y
+# CONFIG_F2FS_FS_COMPRESSION is not set
 CONFIG_F2FS_IOSTAT=y
 CONFIG_ZONEFS_FS=m
 CONFIG_FS_POSIX_ACL=y
diff --git a/config/kernel/linux-rockchip64-edge.config b/config/kernel/linux-rockchip64-edge.config
index 0639d90d97..d831bf3c13 100644
--- a/config/kernel/linux-rockchip64-edge.config
+++ b/config/kernel/linux-rockchip64-edge.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.16.17 Kernel Configuration
+# Linux/arm64 5.17.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -230,7 +230,6 @@ CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
-CONFIG_HAVE_FUTEX_CMPXCHG=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@@ -250,6 +249,7 @@ CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_GUEST_PERF_EVENTS=y
 # CONFIG_PC104 is not set
 
 #
@@ -410,10 +410,6 @@ CONFIG_NR_CPUS=256
 CONFIG_HOTPLUG_CPU=y
 CONFIG_NUMA=y
 CONFIG_NODES_SHIFT=2
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
@@ -457,6 +453,8 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y
 #
 # ARMv8.2 architectural features
 #
+CONFIG_AS_HAS_ARMV8_2=y
+CONFIG_AS_HAS_SHA3=y
 # CONFIG_ARM64_PMEM is not set
 CONFIG_ARM64_RAS_EXTN=y
 CONFIG_ARM64_CNP=y
@@ -704,6 +702,7 @@ CONFIG_ARCH_MMAP_RND_BITS=18
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
@@ -760,6 +759,7 @@ CONFIG_MODULE_SIG_HASH="sha1"
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 CONFIG_MODULE_COMPRESS_XZ=y
 # CONFIG_MODULE_COMPRESS_ZSTD is not set
+CONFIG_MODULE_DECOMPRESS=y
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 # CONFIG_TRIM_UNUSED_KSYMS is not set
@@ -767,6 +767,7 @@ CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_DEV_BSG_COMMON=y
+CONFIG_BLK_ICQ=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_INTEGRITY_T10=y
@@ -872,7 +873,10 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
 CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
-CONFIG_CLEANCACHE=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_FRONTSWAP=y
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
@@ -911,6 +915,7 @@ CONFIG_ZONE_DMA32=y
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_MAPPING_DIRTY_HELPERS=y
 CONFIG_SECRETMEM=y
+CONFIG_ANON_VMA_NAME=y
 
 #
 # Data Access Monitoring
@@ -1112,7 +1117,6 @@ CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -1312,7 +1316,6 @@ CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
@@ -1352,7 +1355,6 @@ CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
@@ -1770,6 +1772,7 @@ CONFIG_BT_INTEL=m
 CONFIG_BT_BCM=m
 CONFIG_BT_RTL=m
 CONFIG_BT_QCA=m
+CONFIG_BT_MTK=m
 CONFIG_BT_HCIBTUSB=m
 # CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
 CONFIG_BT_HCIBTUSB_BCM=y
@@ -1849,6 +1852,7 @@ CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL_GPIO=m
 CONFIG_NET_9P=m
+CONFIG_NET_9P_FD=m
 CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_9P_XEN=m
 # CONFIG_NET_9P_DEBUG is not set
@@ -1912,6 +1916,7 @@ CONFIG_NET_DEVLINK=y
 CONFIG_PAGE_POOL=y
 CONFIG_FAILOVER=m
 CONFIG_ETHTOOL_NETLINK=y
+CONFIG_NETDEV_ADDR_LIST_TEST=m
 
 #
 # Device Drivers
@@ -2028,6 +2033,7 @@ CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_DEVTMPFS_SAFE is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 
@@ -2104,6 +2110,7 @@ CONFIG_SYSFB=y
 CONFIG_ROCKCHIP_SIP=y
 CONFIG_ARM_FFA_TRANSPORT=m
 CONFIG_ARM_FFA_SMCCC=y
+CONFIG_CS_DSP=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
@@ -2143,6 +2150,7 @@ CONFIG_GNSS_SERIAL=m
 CONFIG_GNSS_MTK_SERIAL=m
 CONFIG_GNSS_SIRF_SERIAL=m
 CONFIG_GNSS_UBX_SERIAL=m
+CONFIG_GNSS_USB=m
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
 
@@ -2299,7 +2307,6 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_VIRTIO_BLK=y
 CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_RSXX=m
 
 #
 # NVME Support
@@ -2456,7 +2463,6 @@ CONFIG_SCSI_MPT2SAS=m
 CONFIG_SCSI_MPI3MR=m
 # CONFIG_SCSI_SMARTPQI is not set
 # CONFIG_SCSI_UFSHCD is not set
-# CONFIG_SCSI_UFS_HWMON is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_MYRB is not set
 # CONFIG_SCSI_MYRS is not set
@@ -2745,6 +2751,7 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 CONFIG_NET_DSA_REALTEK_SMI=m
 CONFIG_NET_DSA_SMSC_LAN9303=m
 CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
@@ -2808,8 +2815,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 # CONFIG_BNXT_DCB is not set
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=y
 CONFIG_MACB_USE_HWSTAMP=y
@@ -2839,6 +2844,9 @@ CONFIG_DL2K=m
 # CONFIG_SUNDANCE is not set
 CONFIG_NET_VENDOR_EMULEX=y
 # CONFIG_BE2NET is not set
+CONFIG_NET_VENDOR_ENGLEDER=y
+CONFIG_TSNEP=m
+# CONFIG_TSNEP_SELFTESTS is not set
 CONFIG_NET_VENDOR_EZCHIP=y
 # CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_GOOGLE=y
@@ -2873,7 +2881,6 @@ CONFIG_IXGBE_IPSEC=y
 # CONFIG_ICE is not set
 # CONFIG_FM10K is not set
 # CONFIG_IGC is not set
-CONFIG_NET_VENDOR_MICROSOFT=y
 # CONFIG_JME is not set
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -2902,12 +2909,16 @@ CONFIG_ENC28J60=m
 CONFIG_ENC28J60_WRITEVERIFY=y
 # CONFIG_ENCX24J600 is not set
 # CONFIG_LAN743X is not set
+CONFIG_LAN966X_SWITCH=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
 CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 # CONFIG_MYRI10GE is not set
 # CONFIG_FEALNX is not set
+CONFIG_NET_VENDOR_NI=y
+# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 # CONFIG_NATSEMI is not set
 # CONFIG_NS83820 is not set
@@ -2916,8 +2927,6 @@ CONFIG_NET_VENDOR_NETERION=y
 # CONFIG_VXGE is not set
 CONFIG_NET_VENDOR_NETRONOME=y
 # CONFIG_NFP is not set
-CONFIG_NET_VENDOR_NI=y
-# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_8390=y
 # CONFIG_NE2K_PCI is not set
 CONFIG_NET_VENDOR_NVIDIA=y
@@ -2934,6 +2943,8 @@ CONFIG_NET_VENDOR_QLOGIC=y
 # CONFIG_QLCNIC is not set
 # CONFIG_NETXEN_NIC is not set
 # CONFIG_QED is not set
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCA7000=m
 # CONFIG_QCA7000_SPI is not set
@@ -2952,14 +2963,14 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 # CONFIG_SXGBE_ETH is not set
 CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SOLARFLARE=y
-# CONFIG_SFC is not set
-# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SILAN=y
 # CONFIG_SC92031 is not set
 CONFIG_NET_VENDOR_SIS=y
 # CONFIG_SIS900 is not set
 # CONFIG_SIS190 is not set
+CONFIG_NET_VENDOR_SOLARFLARE=y
+# CONFIG_SFC is not set
+# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=y
 # CONFIG_EPIC100 is not set
@@ -2991,6 +3002,8 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
 # CONFIG_TLAN is not set
+CONFIG_NET_VENDOR_VERTEXCOM=y
+CONFIG_MSE102X=m
 CONFIG_NET_VENDOR_VIA=y
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_VELOCITY is not set
@@ -3350,7 +3363,7 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
-CONFIG_RTL8723CS=m
+# CONFIG_RTL8723CS is not set
 CONFIG_RTW88=m
 # CONFIG_RTW88_8822BE is not set
 # CONFIG_RTW88_8822CE is not set
@@ -3367,7 +3380,7 @@ CONFIG_WLAN_VENDOR_ST=y
 CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
-CONFIG_HFLPS170=m
+# CONFIG_HFLPS170 is not set
 CONFIG_WLAN_VENDOR_TI=y
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
@@ -3378,7 +3391,6 @@ CONFIG_WLCORE=m
 CONFIG_WLCORE_SPI=m
 CONFIG_WLCORE_SDIO=m
 CONFIG_WILINK_PLATFORM_DATA=y
-# CONFIG_RTL8822BS is not set
 CONFIG_RTL8723DU=m
 CONFIG_RTL8723DS=m
 CONFIG_RTL8822CS=m
@@ -3416,6 +3428,7 @@ CONFIG_IEEE802154_HWSIM=m
 # Wireless WAN
 #
 CONFIG_WWAN=m
+CONFIG_WWAN_DEBUGFS=y
 CONFIG_WWAN_HWSIM=m
 CONFIG_MHI_WWAN_CTRL=m
 CONFIG_MHI_WWAN_MBIM=m
@@ -3750,6 +3763,7 @@ CONFIG_SERIAL_8250_DWLIB=y
 CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_RT288X is not set
+CONFIG_SERIAL_8250_PERICOM=m
 CONFIG_SERIAL_OF_PLATFORM=y
 
 #
@@ -3820,10 +3834,10 @@ CONFIG_HW_RANDOM=m
 # CONFIG_HW_RANDOM_BA431 is not set
 # CONFIG_HW_RANDOM_VIRTIO is not set
 CONFIG_HW_RANDOM_MESON=m
-CONFIG_HW_RANDOM_CAVIUM=m
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_HW_RANDOM_XIPHERA is not set
 CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
+CONFIG_HW_RANDOM_CN10K=m
 # CONFIG_APPLICOM is not set
 CONFIG_DEVMEM=y
 CONFIG_DEVPORT=y
@@ -4032,15 +4046,23 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_AS3722=m
 CONFIG_PINCTRL_AXP209=m
+CONFIG_PINCTRL_MAX77620=y
 # CONFIG_PINCTRL_MCP23S08 is not set
+# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
+# CONFIG_PINCTRL_OCELOT is not set
+CONFIG_PINCTRL_RK805=y
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
-CONFIG_PINCTRL_SX150X=y
 CONFIG_PINCTRL_STMFX=m
-CONFIG_PINCTRL_MAX77620=y
-CONFIG_PINCTRL_RK805=y
-# CONFIG_PINCTRL_OCELOT is not set
-# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
+CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_MESON=y
+CONFIG_PINCTRL_MESON_GXBB=y
+CONFIG_PINCTRL_MESON_GXL=y
+CONFIG_PINCTRL_MESON8_PMX=y
+CONFIG_PINCTRL_MESON_AXG=y
+CONFIG_PINCTRL_MESON_AXG_PMX=y
+CONFIG_PINCTRL_MESON_G12A=y
+CONFIG_PINCTRL_MESON_A1=y
 
 #
 # Renesas pinctrl drivers
@@ -4071,14 +4093,6 @@ CONFIG_PINCTRL_SUN50I_H6=y
 CONFIG_PINCTRL_SUN50I_H6_R=y
 CONFIG_PINCTRL_SUN50I_H616=y
 CONFIG_PINCTRL_SUN50I_H616_R=y
-CONFIG_PINCTRL_MESON=y
-CONFIG_PINCTRL_MESON_GXBB=y
-CONFIG_PINCTRL_MESON_GXL=y
-CONFIG_PINCTRL_MESON8_PMX=y
-CONFIG_PINCTRL_MESON_AXG=y
-CONFIG_PINCTRL_MESON_AXG_PMX=y
-CONFIG_PINCTRL_MESON_G12A=y
-CONFIG_PINCTRL_MESON_A1=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
@@ -4133,7 +4147,6 @@ CONFIG_GPIO_TPIC2810=m
 # MFD GPIO expanders
 #
 CONFIG_GPIO_ADP5520=m
-CONFIG_GPIO_BD70528=m
 CONFIG_GPIO_BD71815=m
 CONFIG_GPIO_BD71828=m
 CONFIG_GPIO_MAX77620=y
@@ -4174,6 +4187,7 @@ CONFIG_GPIO_XRA1403=m
 # CONFIG_GPIO_AGGREGATOR is not set
 CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_VIRTIO=m
+CONFIG_GPIO_SIM=m
 # end of Virtual GPIO drivers
 
 CONFIG_W1=m
@@ -4263,6 +4277,7 @@ CONFIG_CHARGER_LT3651=m
 CONFIG_CHARGER_LTC4162L=m
 CONFIG_CHARGER_DETECTOR_MAX14656=m
 CONFIG_CHARGER_MAX77650=m
+CONFIG_CHARGER_MAX77976=m
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24257 is not set
@@ -4391,6 +4406,7 @@ CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NZXT_KRAKEN2=m
+CONFIG_SENSORS_NZXT_SMART2=m
 CONFIG_SENSORS_OCC_P8_I2C=m
 CONFIG_SENSORS_OCC=m
 CONFIG_SENSORS_PCF8591=m
@@ -4400,6 +4416,7 @@ CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_BEL_PFE=m
 CONFIG_SENSORS_BPA_RS600=m
+CONFIG_SENSORS_DELTA_AHE50DC_FAN=m
 CONFIG_SENSORS_FSP_3Y=m
 CONFIG_SENSORS_IBM_CFFPS=m
 CONFIG_SENSORS_DPS920AB=m
@@ -4407,6 +4424,7 @@ CONFIG_SENSORS_INSPUR_IPSPS=m
 CONFIG_SENSORS_IR35221=m
 CONFIG_SENSORS_IR36021=m
 CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IR38064_REGULATOR is not set
 CONFIG_SENSORS_IRPS5401=m
 CONFIG_SENSORS_ISL68137=m
 CONFIG_SENSORS_LM25066=m
@@ -4423,6 +4441,7 @@ CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_MP2888=m
 # CONFIG_SENSORS_MP2975 is not set
+CONFIG_SENSORS_MP5023=m
 CONFIG_SENSORS_PIM4328=m
 CONFIG_SENSORS_PM6764TR=m
 CONFIG_SENSORS_PXE1610=m
@@ -4461,6 +4480,7 @@ CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_AMC6821=m
 CONFIG_SENSORS_INA209=m
 CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_INA238=m
 CONFIG_SENSORS_INA3221=m
 CONFIG_SENSORS_TC74=m
 CONFIG_SENSORS_THMC50=m
@@ -4691,7 +4711,6 @@ CONFIG_MFD_VX855=m
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
-CONFIG_MFD_ROHM_BD70528=m
 CONFIG_MFD_ROHM_BD71828=m
 CONFIG_MFD_ROHM_BD957XMUF=m
 # CONFIG_MFD_STPMIC1 is not set
@@ -4747,6 +4766,7 @@ CONFIG_REGULATOR_MAX77650=m
 CONFIG_REGULATOR_MAX8893=m
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_MAX8973 is not set
+CONFIG_REGULATOR_MAX20086=m
 # CONFIG_REGULATOR_MAX77826 is not set
 CONFIG_REGULATOR_MCP16502=m
 CONFIG_REGULATOR_MP5416=m
@@ -4883,6 +4903,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_FIXED_MINOR_RANGES=y
 CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_H264=m
+CONFIG_V4L2_VP9=m
 CONFIG_V4L2_MEM2MEM_DEV=m
 CONFIG_V4L2_FWNODE=m
 CONFIG_V4L2_ASYNC=m
@@ -5281,6 +5302,7 @@ CONFIG_VIDEO_OV5648=m
 CONFIG_VIDEO_OV6650=m
 CONFIG_VIDEO_OV5670=m
 CONFIG_VIDEO_OV5675=m
+CONFIG_VIDEO_OV5693=m
 CONFIG_VIDEO_OV5695=m
 CONFIG_VIDEO_OV7251=m
 CONFIG_VIDEO_OV772X=m
@@ -5589,8 +5611,7 @@ CONFIG_DRM_TTM=m
 CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_TTM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
-CONFIG_DRM_KMS_CMA_HELPER=y
-CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=m
 CONFIG_DRM_SCHED=m
 
 #
@@ -5630,7 +5651,8 @@ CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_AST is not set
 # CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
-CONFIG_DRM_RCAR_LVDS=m
+# CONFIG_DRM_RCAR_USE_LVDS is not set
+# CONFIG_DRM_RCAR_MIPI_DSI is not set
 CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
@@ -5649,6 +5671,7 @@ CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_ABT_Y030XX067A=m
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
 # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
+CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0=m
 CONFIG_DRM_PANEL_BOE_HIMAX8279D=m
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_DSI_CM=m
@@ -5664,6 +5687,7 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
 CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
 CONFIG_DRM_PANEL_JDI_LT070ME05000=m
+CONFIG_DRM_PANEL_JDI_R63452=m
 CONFIG_DRM_PANEL_KHADAS_TS050=m
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
@@ -5673,6 +5697,7 @@ CONFIG_DRM_PANEL_LG_LB035Q02=m
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 CONFIG_DRM_PANEL_NEC_NL8048HL11=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
+CONFIG_DRM_PANEL_NOVATEK_NT35950=m
 CONFIG_DRM_PANEL_NOVATEK_NT36672A=m
 CONFIG_DRM_PANEL_NOVATEK_NT39016=m
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
@@ -5704,6 +5729,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL_SONY_ACX424AKP=m
 CONFIG_DRM_PANEL_SONY_ACX565AKM=m
+CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
 CONFIG_DRM_PANEL_TDO_TL070WSH30=m
 CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
 CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
@@ -5777,6 +5803,7 @@ CONFIG_DRM_BOCHS=m
 CONFIG_DRM_GM12U320=m
 CONFIG_DRM_SIMPLEDRM=m
 CONFIG_TINYDRM_HX8357D=m
+CONFIG_TINYDRM_ILI9163=m
 CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_ILI9486=m
@@ -5798,6 +5825,7 @@ CONFIG_DRM_LEGACY=y
 # CONFIG_DRM_VIA is not set
 # CONFIG_DRM_SAVAGE is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+CONFIG_DRM_NOMODESET=y
 
 #
 # Frame buffer Devices
@@ -5933,6 +5961,7 @@ CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_SEQ_DEVICE=m
 CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
 # CONFIG_SND_OSSEMUL is not set
@@ -6056,10 +6085,12 @@ CONFIG_SND_USB_TONEPORT=m
 CONFIG_SND_USB_VARIAX=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
 CONFIG_SND_SOC_ADI=m
 CONFIG_SND_SOC_ADI_AXI_I2S=m
 CONFIG_SND_SOC_ADI_AXI_SPDIF=m
 # CONFIG_SND_SOC_AMD_ACP is not set
+CONFIG_SND_AMD_ACP_CONFIG=m
 # CONFIG_SND_ATMEL_SOC is not set
 CONFIG_SND_BCM63XX_I2S_WHISTLER=m
 CONFIG_SND_DESIGNWARE_I2S=m
@@ -6148,6 +6179,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 #
 # CODEC drivers
 #
+CONFIG_SND_SOC_WM_ADSP=m
 # CONFIG_SND_SOC_AC97_CODEC is not set
 CONFIG_SND_SOC_ADAU_UTILS=m
 CONFIG_SND_SOC_ADAU1372=m
@@ -6162,6 +6194,7 @@ CONFIG_SND_SOC_ADAU7118_HW=m
 CONFIG_SND_SOC_ADAU7118_I2C=m
 # CONFIG_SND_SOC_AK4104 is not set
 CONFIG_SND_SOC_AK4118=m
+CONFIG_SND_SOC_AK4375=m
 CONFIG_SND_SOC_AK4458=m
 CONFIG_SND_SOC_AK4554=m
 CONFIG_SND_SOC_AK4613=m
@@ -6177,6 +6210,8 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
 # CONFIG_SND_SOC_CS35L34 is not set
 # CONFIG_SND_SOC_CS35L35 is not set
 CONFIG_SND_SOC_CS35L36=m
+CONFIG_SND_SOC_CS35L41_LIB=m
+CONFIG_SND_SOC_CS35L41=m
 CONFIG_SND_SOC_CS35L41_SPI=m
 CONFIG_SND_SOC_CS35L41_I2C=m
 # CONFIG_SND_SOC_CS42L42 is not set
@@ -6275,6 +6310,7 @@ CONFIG_SND_SOC_TAS6424=m
 CONFIG_SND_SOC_TDA7419=m
 CONFIG_SND_SOC_TFA9879=m
 CONFIG_SND_SOC_TFA989X=m
+CONFIG_SND_SOC_TLV320ADC3XXX=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC23_I2C=m
 CONFIG_SND_SOC_TLV320AIC23_SPI=m
@@ -6407,6 +6443,7 @@ CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LCPOWER=m
 CONFIG_HID_LED=m
 CONFIG_HID_LENOVO=m
+CONFIG_HID_LETSKETCH=m
 CONFIG_HID_LOGITECH=m
 CONFIG_HID_LOGITECH_DJ=m
 CONFIG_HID_LOGITECH_HIDPP=m
@@ -6545,6 +6582,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_HCD_BCMA=m
 CONFIG_USB_HCD_SSB=m
 # CONFIG_USB_HCD_TEST_MODE is not set
+CONFIG_USB_XEN_HCD=m
 
 #
 # USB Device Class drivers
@@ -7007,6 +7045,10 @@ CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_PATTERN=m
 CONFIG_LEDS_TRIGGER_AUDIO=m
 CONFIG_LEDS_TRIGGER_TTY=m
+
+#
+# Simple LED drivers
+#
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_SUPPORT=y
@@ -7359,6 +7401,8 @@ CONFIG_FB_SM750=m
 CONFIG_STAGING_MEDIA=y
 CONFIG_VIDEO_HANTRO=m
 CONFIG_VIDEO_HANTRO_ROCKCHIP=y
+CONFIG_VIDEO_HANTRO_SUNXI=y
+CONFIG_VIDEO_MAX96712=m
 CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_ROCKCHIP_VDEC=m
 CONFIG_VIDEO_SUNXI=y
@@ -7411,7 +7455,6 @@ CONFIG_FB_TFT_TLS8204=m
 CONFIG_FB_TFT_UC1611=m
 CONFIG_FB_TFT_UC1701=m
 CONFIG_FB_TFT_UPD161704=m
-CONFIG_FB_TFT_WATTEROTT=m
 CONFIG_FUSB_30X=m
 # CONFIG_MOST_COMPONENTS is not set
 # CONFIG_KS7010 is not set
@@ -7438,6 +7481,7 @@ CONFIG_CROS_EC_SYSFS=y
 CONFIG_CROS_EC_TYPEC=m
 CONFIG_CROS_USBPD_NOTIFY=y
 # CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_SURFACE_PLATFORMS=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -7463,6 +7507,7 @@ CONFIG_COMMON_CLK_SI544=m
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 CONFIG_COMMON_CLK_CS2000_CP=y
+# CONFIG_COMMON_CLK_LAN966X is not set
 CONFIG_COMMON_CLK_S2MPS11=y
 CONFIG_COMMON_CLK_AXI_CLKGEN=m
 CONFIG_COMMON_CLK_XGENE=y
@@ -7662,6 +7707,7 @@ CONFIG_DEVFREQ_GOV_PASSIVE=m
 #
 CONFIG_ARM_RK3328_DMC_DEVFREQ=y
 CONFIG_ARM_RK3399_DMC_DEVFREQ=y
+CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ=m
 CONFIG_PM_DEVFREQ_EVENT=y
 CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=y
 CONFIG_EXTCON=y
@@ -7829,6 +7875,12 @@ CONFIG_TI_TSC2046=m
 CONFIG_XILINX_XADC=m
 # end of Analog to digital converters
 
+#
+# Analog to digital and digital to analog converters
+#
+CONFIG_AD74413R=m
+# end of Analog to digital and digital to analog converters
+
 #
 # Analog Front Ends
 #
@@ -7899,6 +7951,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # Digital to analog converters
 #
+CONFIG_AD3552R=m
 # CONFIG_AD5064 is not set
 # CONFIG_AD5360 is not set
 # CONFIG_AD5380 is not set
@@ -7919,6 +7972,7 @@ CONFIG_AD5758=m
 CONFIG_AD5766=m
 CONFIG_AD5770R=m
 # CONFIG_AD5791 is not set
+CONFIG_AD7293=m
 # CONFIG_AD7303 is not set
 # CONFIG_AD8801 is not set
 # CONFIG_DPOT_DAC is not set
@@ -7945,6 +7999,12 @@ CONFIG_IIO_SIMPLE_DUMMY=m
 # CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
 # end of IIO dummy driver
 
+#
+# Filters
+#
+CONFIG_ADMV8818=m
+# end of Filters
+
 #
 # Frequency Synthesizers DDS/PLL
 #
@@ -7960,6 +8020,7 @@ CONFIG_IIO_SIMPLE_DUMMY=m
 #
 # CONFIG_ADF4350 is not set
 CONFIG_ADF4371=m
+CONFIG_ADMV1013=m
 CONFIG_ADRF6780=m
 # end of Phase-Locked Loop (PLL) frequency synthesizers
 # end of Frequency Synthesizers DDS/PLL
@@ -8318,8 +8379,10 @@ CONFIG_PHY_CADENCE_SIERRA=m
 # CONFIG_PHY_CADENCE_SALVO is not set
 CONFIG_PHY_FSL_IMX8MQ_USB=m
 CONFIG_PHY_MIXEL_MIPI_DPHY=m
+CONFIG_PHY_FSL_IMX8M_PCIE=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
+CONFIG_PHY_LAN966X_SERDES=m
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHY_MAPPHONE_MDM6600=m
 # CONFIG_PHY_OCELOT_SERDES is not set
@@ -8354,6 +8417,7 @@ CONFIG_ARM_CCI_PMU=m
 CONFIG_ARM_PMU=y
 # CONFIG_ARM_DSU_PMU is not set
 # CONFIG_ARM_SPE_PMU is not set
+CONFIG_HISI_PCIE_PMU=m
 # end of Performance monitor support
 
 CONFIG_RAS=y
@@ -8479,6 +8543,11 @@ CONFIG_F2FS_FS_SECURITY=y
 CONFIG_F2FS_CHECK_FS=y
 # CONFIG_F2FS_FAULT_INJECTION is not set
 CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_FS_LZO=y
+CONFIG_F2FS_FS_LZORLE=y
+CONFIG_F2FS_FS_LZ4=y
+CONFIG_F2FS_FS_LZ4HC=y
+CONFIG_F2FS_FS_ZSTD=y
 CONFIG_F2FS_IOSTAT=y
 CONFIG_ZONEFS_FS=m
 CONFIG_FS_DAX=y
@@ -8509,6 +8578,7 @@ CONFIG_AUTOFS_FS=m
 CONFIG_FUSE_FS=y
 CONFIG_CUSE=m
 CONFIG_VIRTIO_FS=m
+CONFIG_FUSE_DAX=y
 CONFIG_OVERLAY_FS=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
@@ -8526,6 +8596,7 @@ CONFIG_FSCACHE_STATS=y
 # CONFIG_FSCACHE_DEBUG is not set
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_ERROR_INJECTION is not set
 # end of Caches
 
 #
@@ -9066,6 +9137,7 @@ CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_KDF800108_CTR=y
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
@@ -9075,27 +9147,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=y
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_SM4=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -9162,7 +9213,6 @@ CONFIG_HAVE_ARCH_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_CORDIC=m
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_RATIONAL=y
@@ -9171,6 +9221,28 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 # CONFIG_INDIRECT_PIO is not set
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=y
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=m
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
@@ -9197,8 +9269,8 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_COMPRESS=y
+CONFIG_LZ4HC_COMPRESS=y
 CONFIG_LZ4_DECOMPRESS=y
 CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y
@@ -9301,6 +9373,9 @@ CONFIG_FONT_TER16x32=y
 CONFIG_SG_SPLIT=y
 CONFIG_SG_POOL=y
 CONFIG_ARCH_STACKWALK=y
+CONFIG_STACKDEPOT=y
+CONFIG_STACK_HASH_ORDER=20
+CONFIG_REF_TRACKER=y
 CONFIG_SBITMAP=y
 # end of Library routines
 
@@ -9358,11 +9433,19 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN is not set
+CONFIG_HAVE_ARCH_KCSAN=y
 # end of Generic Kernel Debugging Instruments
 
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_MISC=y
 
+#
+# Networking Debugging
+#
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
+# end of Networking Debugging
+
 #
 # Memory Debugging
 #
@@ -9544,7 +9627,6 @@ CONFIG_KUNIT=m
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
@@ -9552,6 +9634,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_SORT is not set
 CONFIG_TEST_DIV64=m
 CONFIG_BACKTRACE_SELF_TEST=m
+CONFIG_TEST_REF_TRACKER=m
 CONFIG_RBTREE_TEST=m
 CONFIG_REED_SOLOMON_TEST=m
 CONFIG_INTERVAL_TREE_TEST=m
@@ -9570,7 +9653,7 @@ CONFIG_TEST_SCANF=m
 CONFIG_TEST_XARRAY=m
 # CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_HASH is not set
+CONFIG_TEST_SIPHASH=m
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_BITOPS is not set
@@ -9582,6 +9665,7 @@ CONFIG_TEST_BLACKHOLE_DEV=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_BITFIELD_KUNIT is not set
+CONFIG_HASH_KUNIT_TEST=m
 CONFIG_RESOURCE_KUNIT_TEST=m
 # CONFIG_SYSCTL_KUNIT_TEST is not set
 # CONFIG_LIST_KUNIT_TEST is not set
diff --git a/config/sources/families/bcm2711.conf b/config/sources/families/bcm2711.conf
index 936d4fe833..b2864b35ab 100644
--- a/config/sources/families/bcm2711.conf
+++ b/config/sources/families/bcm2711.conf
@@ -21,6 +21,7 @@ current)
         export RASPI_DISTRO_KERNEL=no
 	export KERNELSOURCE='https://github.com/raspberrypi/linux'
         export KERNELBRANCH="branch:rpi-5.15.y"
+	export KERNELBRANCH="commit:e45f80eed56f0a65c917056d823028182c29247b"
         export KERNELPATCHDIR="${LINUXFAMILY}-${BRANCH}"
         export LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
 	;;
@@ -28,6 +29,7 @@ edge)
 	export RASPI_DISTRO_KERNEL=no
         export KERNELSOURCE='https://github.com/raspberrypi/linux'
         export KERNELBRANCH="branch:rpi-5.17.y"
+	export KERNELBRANCH="commit:12bb77cfb25018794eda5c7594b01fade904fee9"
 	export KERNELPATCHDIR="${LINUXFAMILY}-${BRANCH}"
 	export LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
 	;;
diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc
index c90e0b5785..d2dd0b51e2 100644
--- a/config/sources/families/include/meson64_common.inc
+++ b/config/sources/families/include/meson64_common.inc
@@ -29,12 +29,14 @@ case $BRANCH in
 	;;
 
         current)
-                KERNELBRANCH='branch:linux-5.10.y'
-                KERNELPATCHDIR='meson64-current'
+		KERNELBRANCH='branch:linux-5.10.y'
+		KERNELBRANCH="tag:v5.10.110"
+		KERNELPATCHDIR='meson64-current'
         ;;
 
         edge)
 		KERNELBRANCH='branch:linux-5.17.y'
+		KERNELBRANCH="tag:v5.17.5"
 		KERNELPATCHDIR='meson64-edge'
         ;;
 
diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc
index cf91ab1087..0485cbcfbd 100644
--- a/config/sources/families/include/rockchip64_common.inc
+++ b/config/sources/families/include/rockchip64_common.inc
@@ -92,6 +92,7 @@ case $BRANCH in
 	current)
 
 		KERNELBRANCH="branch:linux-5.15.y"
+		KERNELBRANCH="tag:v5.15.35"
 		KERNELPATCHDIR='rockchip64-'$BRANCH
 		LINUXFAMILY=rockchip64
 		LINUXCONFIG='linux-rockchip64-'$BRANCH
@@ -100,7 +101,8 @@ case $BRANCH in
 	edge)
 
 		KERNELPATCHDIR='rockchip64-'$BRANCH
-		KERNELBRANCH="branch:linux-5.16.y"
+		KERNELBRANCH="branch:linux-5.17.y"
+		KERNELBRANCH="tag:v5.17.5"
 		LINUXFAMILY=rockchip64
 		LINUXCONFIG='linux-rockchip64-'$BRANCH
 
diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc
index 8991326cbb..d43681afcc 100644
--- a/config/sources/families/include/sunxi64_common.inc
+++ b/config/sources/families/include/sunxi64_common.inc
@@ -11,13 +11,20 @@ LINUXFAMILY=sunxi64
 
 case $BRANCH in
 
-	legacy)  KERNEL_VERSION_LEVEL="5.10" ;;
+	legacy)
+		KERNEL_VERSION_LEVEL="5.10"
+		KERNELSWITCHOBJ="tag=v5.10.110"
+		;;
 
-	current) KERNEL_VERSION_LEVEL="5.15" ;;
+	current)
+		KERNEL_VERSION_LEVEL="5.15"
+		KERNELSWITCHOBJ="tag=v5.15.35"
+		;;
 
-	edge) KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-5.17}
-	      #KERNELSWITCHOBJ="tag=v5.16.11"
-	      ;;
+	edge) 
+		KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-5.17}
+		KERNELSWITCHOBJ="tag=v5.17.5"
+		;;
 esac
 
 case "$KERNEL_VERSION_LEVEL" in
diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc
index 7dfaf86a15..54ddac0157 100644
--- a/config/sources/families/include/sunxi_common.inc
+++ b/config/sources/families/include/sunxi_common.inc
@@ -12,11 +12,18 @@ GOVERNOR=ondemand
 
 case $BRANCH in
 
-	legacy)  KERNEL_VERSION_LEVEL="5.10" ;;
-	current) KERNEL_VERSION_LEVEL="5.15" ;;
-	edge) KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-5.17}
-	      #KERNELSWITCHOBJ="tag=v5.16.11"
-	      ;;
+	legacy)
+		KERNEL_VERSION_LEVEL="5.10"
+		KERNELSWITCHOBJ="tag=v5.10.110"
+		;;
+	current)
+		KERNEL_VERSION_LEVEL="5.15"
+		KERNELSWITCHOBJ="tag=v5.15.35"
+		;;
+	edge) 
+		KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-5.17}
+		KERNELSWITCHOBJ="tag=v5.17.5"
+		;;
 
 esac
 
diff --git a/config/sources/families/jetson-nano.conf b/config/sources/families/jetson-nano.conf
index 8d8cd2c797..807d162bf3 100644
--- a/config/sources/families/jetson-nano.conf
+++ b/config/sources/families/jetson-nano.conf
@@ -22,6 +22,7 @@ case $BRANCH in
 
 	current)
 		KERNELBRANCH="branch:linux-5.17.y"
+		KERNELBRANCH="tag:v5.17.5"
 		KERNELPATCHDIR='media-'$BRANCH
 		LINUXFAMILY=media
 		LINUXCONFIG='linux-media-'$BRANCH
@@ -29,7 +30,7 @@ case $BRANCH in
 	;;
 
 	edge)
-		KERNELSOURCE='https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
+		KERNELBRANCH="branch:linux-5.18.y"
 		KERNELBRANCH="tag:v5.18-rc4"
 		KERNELPATCHDIR='media-'$BRANCH
 		LINUXFAMILY=media
diff --git a/config/sources/families/media.conf b/config/sources/families/media.conf
index 72b228c7b1..1784dda506 100644
--- a/config/sources/families/media.conf
+++ b/config/sources/families/media.conf
@@ -42,15 +42,15 @@ case $BRANCH in
 
 	current)
 			KERNELBRANCH="branch:linux-5.17.y"
+			KERNELBRANCH="tag:v5.17.5"
 			KERNELPATCHDIR='media-'$BRANCH
 			LINUXFAMILY=media
 			LINUXCONFIG='linux-media-'$BRANCH
 	;;
 
 	edge)
-#			KERNELBRANCH="branch:linux-5.18.y"
-			KERNELSOURCE='https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
-			KERNELBRANCH="tag:v5.18-rc4"
+			KERNELBRANCH="branch:linux-5.18.y"
+			KERNELBRANCH="tag:v5.18-rc4"			
 			KERNELPATCHDIR='media-'$BRANCH
 			LINUXFAMILY=media
 			LINUXCONFIG='linux-media-'$BRANCH
diff --git a/config/sources/families/mvebu.conf b/config/sources/families/mvebu.conf
index 008455e385..09db507956 100644
--- a/config/sources/families/mvebu.conf
+++ b/config/sources/families/mvebu.conf
@@ -18,12 +18,14 @@ case $BRANCH in
 	current)
 
 		KERNELBRANCH='branch:linux-5.15.y'
+		KERNELBRANCH="tag:v5.15.35"
 
 	;;
 
 	edge)
 
 		KERNELBRANCH='branch:linux-5.17.y'
+		KERNELBRANCH="tag:v5.17.5"
 		
 		LINUXCONFIG='linux-mvebu-edge'
 		KERNELPATCHDIR="mvebu-edge"
diff --git a/config/sources/families/mvebu64.conf b/config/sources/families/mvebu64.conf
index 0d2a8c5b5d..d8081e6269 100644
--- a/config/sources/families/mvebu64.conf
+++ b/config/sources/families/mvebu64.conf
@@ -43,12 +43,14 @@ case $BRANCH in
 	current)
 
 		KERNELBRANCH='branch:linux-5.15.y'
+		KERNELBRANCH="tag:v5.15.35"
 
 	;;
 
         edge)
 
 		KERNELBRANCH='branch:linux-5.17.y'
+		KERNELBRANCH="tag:v5.17.5"
         ;;
 
 esac
diff --git a/config/sources/families/odroidxu4.conf b/config/sources/families/odroidxu4.conf
index 81649c2ab3..859a8f3fc6 100644
--- a/config/sources/families/odroidxu4.conf
+++ b/config/sources/families/odroidxu4.conf
@@ -25,7 +25,7 @@ case $BRANCH in
 	edge)
 
 		KERNELBRANCH='branch:linux-5.17.y'
-
+		KERNELBRANCH="tag:v5.17.5"
 	;;
 
 esac
diff --git a/config/sources/families/rk322x.conf b/config/sources/families/rk322x.conf
index 97c3e47b95..b2bc12c368 100644
--- a/config/sources/families/rk322x.conf
+++ b/config/sources/families/rk322x.conf
@@ -20,13 +20,14 @@ case $BRANCH in
 	current)
 
 		KERNELBRANCH='branch:linux-5.15.y'
+		KERNELBRANCH="tag:v5.15.35"
 
 	;;
 
 	edge)
 		
 		KERNELBRANCH='branch:linux-5.17.y'
-
+		KERNELBRANCH="tag:v5.17.5"
 	;;
 
 esac
diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf
index 8c88a2d2ee..ff98fc1eea 100644
--- a/config/sources/families/rk35xx.conf
+++ b/config/sources/families/rk35xx.conf
@@ -21,11 +21,13 @@ case $BRANCH in
         # temporary until kernel 5.16 is well supported for rockchip64
         # it has to be its own family too
         edge)
-               KERNELBRANCH="branch:linux-5.17.y"
-               KERNELPATCHDIR='rk35xx-'$BRANCH
-               SKIP_BOOTSPLASH="yes"
-               LINUXFAMILY=rk35xx
-               LINUXCONFIG='linux-rk35xx-'$BRANCH
+
+		KERNELBRANCH="branch:linux-5.17.y"
+		KERNELBRANCH="tag:v5.17.5"
+		KERNELPATCHDIR='rk35xx-'$BRANCH
+		SKIP_BOOTSPLASH="yes"
+		LINUXFAMILY=rk35xx
+		LINUXCONFIG='linux-rk35xx-'$BRANCH
 
         ;;
 
diff --git a/config/sources/families/rockchip.conf b/config/sources/families/rockchip.conf
index a9d19db47e..73dde3ee49 100644
--- a/config/sources/families/rockchip.conf
+++ b/config/sources/families/rockchip.conf
@@ -25,13 +25,14 @@ case $BRANCH in
 	current)
 
 		KERNELBRANCH='branch:linux-5.15.y'
+		KERNELBRANCH="tag:v5.15.35"
 
 	;;
 
 	edge)
 
 		KERNELBRANCH='branch:linux-5.17.y'
-
+		KERNELBRANCH="tag:v5.17.5"
 	;;
 
 esac
diff --git a/config/sources/families/virtual.conf b/config/sources/families/virtual.conf
index b3c654cfca..b9be03ff52 100644
--- a/config/sources/families/virtual.conf
+++ b/config/sources/families/virtual.conf
@@ -2,6 +2,8 @@
 BOOTBRANCH='tag:v2021.04'
 
 KERNELBRANCH='branch:linux-5.10.y'
+KERNELBRANCH="tag:v5.15.35"
+
 ARCH=arm64
 #UBOOT_TARGET_MAP=";;u-boot.bin"
 UBOOT_TARGET_MAP="u-boot-dtb.img;;u-boot.bin:u-boot.bin u-boot-dtb.img"
diff --git a/lib/compilation-prepare.sh b/lib/compilation-prepare.sh
index f9ce514a9e..7a9479f820 100644
--- a/lib/compilation-prepare.sh
+++ b/lib/compilation-prepare.sh
@@ -114,7 +114,6 @@ compilation_prepare()
 	if linux-version compare "${version}" ge 5.10 && [ $SKIP_BOOTSPLASH != yes ]; then
 
 		display_alert "Adding" "Kernel splash file" "info"
-
 		if linux-version compare "${version}" ge 5.11; then
 			process_patch_file "${SRC}/patch/misc/bootsplash-5.16.y-0000-Revert-fbcon-Avoid-cap-set-but-not-used-warning.patch" "applying"
 		fi
@@ -167,7 +166,7 @@ compilation_prepare()
 	#
 	# Older versions have AUFS support with a patch
 
-	if linux-version compare "${version}" ge 5.1 && linux-version compare "${version}" le 5.18 && [ "$AUFS" == yes ]; then
+	if linux-version compare "${version}" ge 5.1 && linux-version compare "${version}" lt 5.15 && [ "$AUFS" == yes ]; then
 
 		# attach to specifics tag or branch
 		local aufstag
diff --git a/patch/kernel/archive/rockchip64-5.16/general-btsdio-ignore-uart-devs.patch b/patch/kernel/archive/rockchip64-5.16/general-btsdio-ignore-uart-devs.patch
deleted file mode 100644
index 8119bd8ad7..0000000000
--- a/patch/kernel/archive/rockchip64-5.16/general-btsdio-ignore-uart-devs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Some UART BT devices wrongly present themselves as SDIO - probably
-because their WiFi counterparts are SDIO based.
-This leads to creating a non functional fantom hci0 device.
-
-This happens with AP6256 seen on both ROCK Pi 4 and OrangePi 4.
-
-diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
-index 199e8f7d4..2edb53bfe 100644
---- a/drivers/bluetooth/btsdio.c
-+++ b/drivers/bluetooth/btsdio.c
-@@ -295,6 +295,8 @@ static int btsdio_probe(struct sdio_func *func,
- 		switch (func->device) {
- 		case SDIO_DEVICE_ID_BROADCOM_43341:
- 		case SDIO_DEVICE_ID_BROADCOM_43430:
-+		case SDIO_DEVICE_ID_BROADCOM_4345:
-+		case SDIO_DEVICE_ID_BROADCOM_43455:
- 		case SDIO_DEVICE_ID_BROADCOM_4356:
- 			return -ENODEV;
- 		}
diff --git a/patch/kernel/archive/rockchip64-5.16/0001-Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-hea.patch b/patch/kernel/archive/rockchip64-5.17/0001-Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-hea.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/0001-Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-hea.patch
rename to patch/kernel/archive/rockchip64-5.17/0001-Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-hea.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-board-Z28-PRO-as-link-to-Rock64.patch b/patch/kernel/archive/rockchip64-5.17/add-board-Z28-PRO-as-link-to-Rock64.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-board-Z28-PRO-as-link-to-Rock64.patch
rename to patch/kernel/archive/rockchip64-5.17/add-board-Z28-PRO-as-link-to-Rock64.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-board-helios64.patch b/patch/kernel/archive/rockchip64-5.17/add-board-helios64.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-board-helios64.patch
rename to patch/kernel/archive/rockchip64-5.17/add-board-helios64.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-board-nanopi-m4v2.patch b/patch/kernel/archive/rockchip64-5.17/add-board-nanopi-m4v2.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-board-nanopi-m4v2.patch
rename to patch/kernel/archive/rockchip64-5.17/add-board-nanopi-m4v2.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-board-nanopi-r2c.patch b/patch/kernel/archive/rockchip64-5.17/add-board-nanopi-r2c.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-board-nanopi-r2c.patch
rename to patch/kernel/archive/rockchip64-5.17/add-board-nanopi-r2c.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-board-nanopi-r2s.patch b/patch/kernel/archive/rockchip64-5.17/add-board-nanopi-r2s.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-board-nanopi-r2s.patch
rename to patch/kernel/archive/rockchip64-5.17/add-board-nanopi-r2s.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-board-nanopi-r4s.patch b/patch/kernel/archive/rockchip64-5.17/add-board-nanopi-r4s.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-board-nanopi-r4s.patch
rename to patch/kernel/archive/rockchip64-5.17/add-board-nanopi-r4s.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-board-orangepi-4.patch b/patch/kernel/archive/rockchip64-5.17/add-board-orangepi-4.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-board-orangepi-4.patch
rename to patch/kernel/archive/rockchip64-5.17/add-board-orangepi-4.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-board-orangepi-r1plus.patch b/patch/kernel/archive/rockchip64-5.17/add-board-orangepi-r1plus.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-board-orangepi-r1plus.patch
rename to patch/kernel/archive/rockchip64-5.17/add-board-orangepi-r1plus.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-board-rk3328-roc-pc-as-station-m1.patch b/patch/kernel/archive/rockchip64-5.17/add-board-rk3328-roc-pc-as-station-m1.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-board-rk3328-roc-pc-as-station-m1.patch
rename to patch/kernel/archive/rockchip64-5.17/add-board-rk3328-roc-pc-as-station-m1.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-board-rk3399-roc-pc-plus.patch b/patch/kernel/archive/rockchip64-5.17/add-board-rk3399-roc-pc-plus.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-board-rk3399-roc-pc-plus.patch
rename to patch/kernel/archive/rockchip64-5.17/add-board-rk3399-roc-pc-plus.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-board-tinker-board-2.patch b/patch/kernel/archive/rockchip64-5.17/add-board-tinker-board-2.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-board-tinker-board-2.patch
rename to patch/kernel/archive/rockchip64-5.17/add-board-tinker-board-2.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-board-xxx-nanopi-Neo3-with-enabled-I2S-and-spdif.patch b/patch/kernel/archive/rockchip64-5.17/add-board-xxx-nanopi-Neo3-with-enabled-I2S-and-spdif.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-board-xxx-nanopi-Neo3-with-enabled-I2S-and-spdif.patch
rename to patch/kernel/archive/rockchip64-5.17/add-board-xxx-nanopi-Neo3-with-enabled-I2S-and-spdif.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-boards-to-dts-makefile.patch b/patch/kernel/archive/rockchip64-5.17/add-boards-to-dts-makefile.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-boards-to-dts-makefile.patch
rename to patch/kernel/archive/rockchip64-5.17/add-boards-to-dts-makefile.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-csgpio-to-rockchip-spi.patch b/patch/kernel/archive/rockchip64-5.17/add-csgpio-to-rockchip-spi.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-csgpio-to-rockchip-spi.patch
rename to patch/kernel/archive/rockchip64-5.17/add-csgpio-to-rockchip-spi.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-driver-for-Motorcomm-YT85xx+PHYs.patch b/patch/kernel/archive/rockchip64-5.17/add-driver-for-Motorcomm-YT85xx+PHYs.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-driver-for-Motorcomm-YT85xx+PHYs.patch
rename to patch/kernel/archive/rockchip64-5.17/add-driver-for-Motorcomm-YT85xx+PHYs.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-fusb30x-driver.patch b/patch/kernel/archive/rockchip64-5.17/add-fusb30x-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-fusb30x-driver.patch
rename to patch/kernel/archive/rockchip64-5.17/add-fusb30x-driver.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-maker-friendlyarm.patch b/patch/kernel/archive/rockchip64-5.17/add-maker-friendlyarm.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-maker-friendlyarm.patch
rename to patch/kernel/archive/rockchip64-5.17/add-maker-friendlyarm.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-rk3328-usb3-phy-driver.patch b/patch/kernel/archive/rockchip64-5.17/add-rk3328-usb3-phy-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-rk3328-usb3-phy-driver.patch
rename to patch/kernel/archive/rockchip64-5.17/add-rk3328-usb3-phy-driver.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/add-rockchip-iep-driver.patch b/patch/kernel/archive/rockchip64-5.17/add-rockchip-iep-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/add-rockchip-iep-driver.patch
rename to patch/kernel/archive/rockchip64-5.17/add-rockchip-iep-driver.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-firefly-rk3399-dts.patch b/patch/kernel/archive/rockchip64-5.17/board-firefly-rk3399-dts.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-firefly-rk3399-dts.patch
rename to patch/kernel/archive/rockchip64-5.17/board-firefly-rk3399-dts.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-helios64-dts-fix-stability-issues.patch b/patch/kernel/archive/rockchip64-5.17/board-helios64-dts-fix-stability-issues.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-helios64-dts-fix-stability-issues.patch
rename to patch/kernel/archive/rockchip64-5.17/board-helios64-dts-fix-stability-issues.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-helios64-remove-overclock.patch b/patch/kernel/archive/rockchip64-5.17/board-helios64-remove-overclock.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-helios64-remove-overclock.patch
rename to patch/kernel/archive/rockchip64-5.17/board-helios64-remove-overclock.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-helios64-remove-pcie-ep-gpios.patch b/patch/kernel/archive/rockchip64-5.17/board-helios64-remove-pcie-ep-gpios.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-helios64-remove-pcie-ep-gpios.patch
rename to patch/kernel/archive/rockchip64-5.17/board-helios64-remove-pcie-ep-gpios.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-nanopc-t4-add-typec-dp.patch b/patch/kernel/archive/rockchip64-5.17/board-nanopc-t4-add-typec-dp.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-nanopc-t4-add-typec-dp.patch
rename to patch/kernel/archive/rockchip64-5.17/board-nanopc-t4-add-typec-dp.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-nanopi-m4v2-dts-add-sound-card.patch b/patch/kernel/archive/rockchip64-5.17/board-nanopi-m4v2-dts-add-sound-card.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-nanopi-m4v2-dts-add-sound-card.patch
rename to patch/kernel/archive/rockchip64-5.17/board-nanopi-m4v2-dts-add-sound-card.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-nanopi-m4v2-dts-ethernet-tweak.patch b/patch/kernel/archive/rockchip64-5.17/board-nanopi-m4v2-dts-ethernet-tweak.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-nanopi-m4v2-dts-ethernet-tweak.patch
rename to patch/kernel/archive/rockchip64-5.17/board-nanopi-m4v2-dts-ethernet-tweak.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-nanopi-m4v2-dts-fix-stability-issues.patch b/patch/kernel/archive/rockchip64-5.17/board-nanopi-m4v2-dts-fix-stability-issues.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-nanopi-m4v2-dts-fix-stability-issues.patch
rename to patch/kernel/archive/rockchip64-5.17/board-nanopi-m4v2-dts-fix-stability-issues.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-nanopi-r2s-r8152-customise-leds.patch b/patch/kernel/archive/rockchip64-5.17/board-nanopi-r2s-r8152-customise-leds.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-nanopi-r2s-r8152-customise-leds.patch
rename to patch/kernel/archive/rockchip64-5.17/board-nanopi-r2s-r8152-customise-leds.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-nanopi-r2s-r8152-mac-from-dt.patch b/patch/kernel/archive/rockchip64-5.17/board-nanopi-r2s-r8152-mac-from-dt.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-nanopi-r2s-r8152-mac-from-dt.patch
rename to patch/kernel/archive/rockchip64-5.17/board-nanopi-r2s-r8152-mac-from-dt.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-pbp-add-dp-alt-mode.patch b/patch/kernel/archive/rockchip64-5.17/board-pbp-add-dp-alt-mode.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-pbp-add-dp-alt-mode.patch
rename to patch/kernel/archive/rockchip64-5.17/board-pbp-add-dp-alt-mode.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-pbp-add-dp-alt-mode.patch.disabled b/patch/kernel/archive/rockchip64-5.17/board-pbp-add-dp-alt-mode.patch.disabled
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-pbp-add-dp-alt-mode.patch.disabled
rename to patch/kernel/archive/rockchip64-5.17/board-pbp-add-dp-alt-mode.patch.disabled
diff --git a/patch/kernel/archive/rockchip64-5.16/board-pbp-add-suspend.patch b/patch/kernel/archive/rockchip64-5.17/board-pbp-add-suspend.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-pbp-add-suspend.patch
rename to patch/kernel/archive/rockchip64-5.17/board-pbp-add-suspend.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-pbp-fix-wonky-wifi-bt.patch b/patch/kernel/archive/rockchip64-5.17/board-pbp-fix-wonky-wifi-bt.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-pbp-fix-wonky-wifi-bt.patch
rename to patch/kernel/archive/rockchip64-5.17/board-pbp-fix-wonky-wifi-bt.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-renegade-dts-cleanup.patch.dis b/patch/kernel/archive/rockchip64-5.17/board-renegade-dts-cleanup.patch.dis
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-renegade-dts-cleanup.patch.dis
rename to patch/kernel/archive/rockchip64-5.17/board-renegade-dts-cleanup.patch.dis
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rk3328-roc-cc-dts-enable-dmc.patch b/patch/kernel/archive/rockchip64-5.17/board-rk3328-roc-cc-dts-enable-dmc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rk3328-roc-cc-dts-enable-dmc.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rk3328-roc-cc-dts-enable-dmc.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rk3328-roc-cc-dts-ram-profile.patch b/patch/kernel/archive/rockchip64-5.17/board-rk3328-roc-cc-dts-ram-profile.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rk3328-roc-cc-dts-ram-profile.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rk3328-roc-cc-dts-ram-profile.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rk3328-roc-cc-rock64-add-usb3.patch b/patch/kernel/archive/rockchip64-5.17/board-rk3328-roc-cc-rock64-add-usb3.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rk3328-roc-cc-rock64-add-usb3.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rk3328-roc-cc-rock64-add-usb3.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rk3328-roc-pc-dts-enable-dmc.patch b/patch/kernel/archive/rockchip64-5.17/board-rk3328-roc-pc-dts-enable-dmc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rk3328-roc-pc-dts-enable-dmc.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rk3328-roc-pc-dts-enable-dmc.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rk3328-roc-pc-dts-ram-profile.patch b/patch/kernel/archive/rockchip64-5.17/board-rk3328-roc-pc-dts-ram-profile.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rk3328-roc-pc-dts-ram-profile.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rk3328-roc-pc-dts-ram-profile.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-roc-rk3399-pc-fix-fusb302-compatible.patch b/patch/kernel/archive/rockchip64-5.17/board-roc-rk3399-pc-fix-fusb302-compatible.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-roc-rk3399-pc-fix-fusb302-compatible.patch
rename to patch/kernel/archive/rockchip64-5.17/board-roc-rk3399-pc-fix-fusb302-compatible.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rock64-mail-supply.patch b/patch/kernel/archive/rockchip64-5.17/board-rock64-mail-supply.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rock64-mail-supply.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rock64-mail-supply.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpi4-0001-arm64-dts-audio-over-hdmi.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpi4-0001-arm64-dts-audio-over-hdmi.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpi4-0001-arm64-dts-audio-over-hdmi.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpi4-0001-arm64-dts-audio-over-hdmi.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpi4-0002-arm64-dts-leds.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpi4-0002-arm64-dts-leds.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpi4-0002-arm64-dts-leds.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpi4-0002-arm64-dts-leds.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpi4-0003-arm64-dts-pcie.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpi4-0003-arm64-dts-pcie.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpi4-0003-arm64-dts-pcie.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpi4-0003-arm64-dts-pcie.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpi4-Add-DT-link-for-backward-compatibility.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpi4-Add-DT-link-for-backward-compatibility.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpi4-Add-DT-link-for-backward-compatibility.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpi4-Add-DT-link-for-backward-compatibility.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpi4-FixMMCFreq.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpi4-FixMMCFreq.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpi4-FixMMCFreq.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpi4-FixMMCFreq.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpi4c-add-minidp.patch.WIP b/patch/kernel/archive/rockchip64-5.17/board-rockpi4c-add-minidp.patch.WIP
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpi4c-add-minidp.patch.WIP
rename to patch/kernel/archive/rockchip64-5.17/board-rockpi4c-add-minidp.patch.WIP
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0001-arm64-dts-rockchip-add-ROCK-Pi-S-DTS-support.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0001-arm64-dts-rockchip-add-ROCK-Pi-S-DTS-support.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0001-arm64-dts-rockchip-add-ROCK-Pi-S-DTS-support.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0001-arm64-dts-rockchip-add-ROCK-Pi-S-DTS-support.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0002-Fixes-for-rk3308-rock-pi-s-dts.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0002-Fixes-for-rk3308-rock-pi-s-dts.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0002-Fixes-for-rk3308-rock-pi-s-dts.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0002-Fixes-for-rk3308-rock-pi-s-dts.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0003-WIP-Wireless-support.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0003-WIP-Wireless-support.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0003-WIP-Wireless-support.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0003-WIP-Wireless-support.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0006-arm64-dts-rockchip-Enable-mac-node-on-rk3308-rock-pi.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0006-arm64-dts-rockchip-Enable-mac-node-on-rk3308-rock-pi.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0006-arm64-dts-rockchip-Enable-mac-node-on-rk3308-rock-pi.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0006-arm64-dts-rockchip-Enable-mac-node-on-rk3308-rock-pi.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0009-arm64-dts-rockchip-Enable-tsadc-node-on-rk3308-rock-.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0009-arm64-dts-rockchip-Enable-tsadc-node-on-rk3308-rock-.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0009-arm64-dts-rockchip-Enable-tsadc-node-on-rk3308-rock-.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0009-arm64-dts-rockchip-Enable-tsadc-node-on-rk3308-rock-.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0011-arm64-dts-rockchip-Set-is2_8ch-clocks-on-rk3308-rock.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0011-arm64-dts-rockchip-Set-is2_8ch-clocks-on-rk3308-rock.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0011-arm64-dts-rockchip-Set-is2_8ch-clocks-on-rk3308-rock.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0011-arm64-dts-rockchip-Set-is2_8ch-clocks-on-rk3308-rock.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0013-Add-simple-audio-card.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0013-Add-simple-audio-card.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0013-Add-simple-audio-card.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0013-Add-simple-audio-card.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0015-arm64-dts-rockchip-Move-wireless-wlan-node-into-sdio.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0015-arm64-dts-rockchip-Move-wireless-wlan-node-into-sdio.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0015-arm64-dts-rockchip-Move-wireless-wlan-node-into-sdio.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0015-arm64-dts-rockchip-Move-wireless-wlan-node-into-sdio.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0019-Sync-rk3308_codec-to-BSP-tree.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0021-arm64-dts-rockchip-enable-analog-audio-node-for-rk33.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0021-arm64-dts-rockchip-enable-analog-audio-node-for-rk33.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0021-arm64-dts-rockchip-enable-analog-audio-node-for-rk33.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0021-arm64-dts-rockchip-enable-analog-audio-node-for-rk33.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0022-ASoC-rk3308_codec-replace-codec-to-component.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0024-add-uart2-for-debug-rock-pi-s-dts.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0024-add-uart2-for-debug-rock-pi-s-dts.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0024-add-uart2-for-debug-rock-pi-s-dts.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0024-add-uart2-for-debug-rock-pi-s-dts.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0026-add-usb-host-otg-dts.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0026-add-usb-host-otg-dts.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0026-add-usb-host-otg-dts.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0026-add-usb-host-otg-dts.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0028-arm64-dts-rk3308-add-opp-1300mhz.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0028-arm64-dts-rk3308-add-opp-1300mhz.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0028-arm64-dts-rk3308-add-opp-1300mhz.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0028-arm64-dts-rk3308-add-opp-1300mhz.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0030-disabled-emmc-fix-boot-sdcard.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0030-disabled-emmc-fix-boot-sdcard.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0030-disabled-emmc-fix-boot-sdcard.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0030-disabled-emmc-fix-boot-sdcard.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpis-0031-arm64-dts-rk3399-rockpro64-Add-pcie-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpis-0031-arm64-dts-rk3399-rockpro64-Add-pcie-bus-scan-delay.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpis-0031-arm64-dts-rk3399-rockpro64-Add-pcie-bus-scan-delay.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpis-0031-arm64-dts-rk3399-rockpro64-Add-pcie-bus-scan-delay.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpro64-change-rx_delay-for-gmac.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpro64-change-rx_delay-for-gmac.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpro64-change-rx_delay-for-gmac.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpro64-change-rx_delay-for-gmac.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpro64-fix-emmc.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpro64-fix-emmc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpro64-fix-emmc.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpro64-fix-emmc.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpro64-fix-spi1-flash-speed.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpro64-fix-spi1-flash-speed.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpro64-fix-spi1-flash-speed.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpro64-fix-spi1-flash-speed.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/board-rockpro64-work-led-heartbeat.patch b/patch/kernel/archive/rockchip64-5.17/board-rockpro64-work-led-heartbeat.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/board-rockpro64-work-led-heartbeat.patch
rename to patch/kernel/archive/rockchip64-5.17/board-rockpro64-work-led-heartbeat.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-add-dwc3-xhci-usb-trb-quirk.patch b/patch/kernel/archive/rockchip64-5.17/general-add-dwc3-xhci-usb-trb-quirk.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-add-dwc3-xhci-usb-trb-quirk.patch
rename to patch/kernel/archive/rockchip64-5.17/general-add-dwc3-xhci-usb-trb-quirk.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-add-miniDP-dt-doc.patch b/patch/kernel/archive/rockchip64-5.17/general-add-miniDP-dt-doc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-add-miniDP-dt-doc.patch
rename to patch/kernel/archive/rockchip64-5.17/general-add-miniDP-dt-doc.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-add-miniDP-virtual-extcon.patch b/patch/kernel/archive/rockchip64-5.17/general-add-miniDP-virtual-extcon.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-add-miniDP-virtual-extcon.patch
rename to patch/kernel/archive/rockchip64-5.17/general-add-miniDP-virtual-extcon.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-add-overlay-compilation-support.patch b/patch/kernel/archive/rockchip64-5.17/general-add-overlay-compilation-support.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-add-overlay-compilation-support.patch
rename to patch/kernel/archive/rockchip64-5.17/general-add-overlay-compilation-support.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-add-overlay-configfs.patch b/patch/kernel/archive/rockchip64-5.17/general-add-overlay-configfs.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-add-overlay-configfs.patch
rename to patch/kernel/archive/rockchip64-5.17/general-add-overlay-configfs.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-add-panel-simple-dsi.patch b/patch/kernel/archive/rockchip64-5.17/general-add-panel-simple-dsi.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-add-panel-simple-dsi.patch
rename to patch/kernel/archive/rockchip64-5.17/general-add-panel-simple-dsi.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-add-pll-hdmi-timings.patch b/patch/kernel/archive/rockchip64-5.17/general-add-pll-hdmi-timings.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-add-pll-hdmi-timings.patch
rename to patch/kernel/archive/rockchip64-5.17/general-add-pll-hdmi-timings.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-add-xtx-spi-nor-chips.patch b/patch/kernel/archive/rockchip64-5.17/general-add-xtx-spi-nor-chips.patch
similarity index 95%
rename from patch/kernel/archive/rockchip64-5.16/general-add-xtx-spi-nor-chips.patch
rename to patch/kernel/archive/rockchip64-5.17/general-add-xtx-spi-nor-chips.patch
index 654c58d93c..13c696033b 100644
--- a/patch/kernel/archive/rockchip64-5.16/general-add-xtx-spi-nor-chips.patch
+++ b/patch/kernel/archive/rockchip64-5.17/general-add-xtx-spi-nor-chips.patch
@@ -67,8 +67,8 @@ index 000000000000..05f2d69401b2
 +
 +static const struct flash_info xtx_parts[] = {
 + /* XTX (Shenzhen Xin Tian Xia Tech) */
-+ { "xt25f32b", INFO(0x0b4016, 0, 64 * 1024, 64, SECT_4K) },
-+ { "xt25f128b", INFO(0x0b4018, 0, 64 * 1024, 256, SECT_4K) },
++ { "xt25f32b", INFO(0x0b4016, 0, 64 * 1024, 64) },
++ { "xt25f128b", INFO(0x0b4018, 0, 64 * 1024, 256) },
 +};
 +
 +const struct spi_nor_manufacturer spi_nor_xtx = {
diff --git a/patch/kernel/archive/rockchip64-5.16/general-bluetooth-02-add-support-for-RTL8723CS.patch b/patch/kernel/archive/rockchip64-5.17/general-bluetooth-02-add-support-for-RTL8723CS.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-bluetooth-02-add-support-for-RTL8723CS.patch
rename to patch/kernel/archive/rockchip64-5.17/general-bluetooth-02-add-support-for-RTL8723CS.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-bluetooth-03-hci_h5-add-binding-RTL8723CS.patch b/patch/kernel/archive/rockchip64-5.17/general-bluetooth-03-hci_h5-add-binding-RTL8723CS.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-bluetooth-03-hci_h5-add-binding-RTL8723CS.patch
rename to patch/kernel/archive/rockchip64-5.17/general-bluetooth-03-hci_h5-add-binding-RTL8723CS.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-bluetooth-04-add-rtl8703bs.patch b/patch/kernel/archive/rockchip64-5.17/general-bluetooth-04-add-rtl8703bs.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-bluetooth-04-add-rtl8703bs.patch
rename to patch/kernel/archive/rockchip64-5.17/general-bluetooth-04-add-rtl8703bs.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-bluetooth-add-new-quirk.patch b/patch/kernel/archive/rockchip64-5.17/general-bluetooth-add-new-quirk.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-bluetooth-add-new-quirk.patch
rename to patch/kernel/archive/rockchip64-5.17/general-bluetooth-add-new-quirk.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-disable-mtu-validation.patch b/patch/kernel/archive/rockchip64-5.17/general-disable-mtu-validation.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-disable-mtu-validation.patch
rename to patch/kernel/archive/rockchip64-5.17/general-disable-mtu-validation.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-emmc-hs400es-init-tweak.patch b/patch/kernel/archive/rockchip64-5.17/general-emmc-hs400es-init-tweak.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-emmc-hs400es-init-tweak.patch
rename to patch/kernel/archive/rockchip64-5.17/general-emmc-hs400es-init-tweak.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-enhance-backport-es8328-driver.patch b/patch/kernel/archive/rockchip64-5.17/general-enhance-backport-es8328-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-enhance-backport-es8328-driver.patch
rename to patch/kernel/archive/rockchip64-5.17/general-enhance-backport-es8328-driver.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-fix-es8316-kernel-panic.patch b/patch/kernel/archive/rockchip64-5.17/general-fix-es8316-kernel-panic.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-fix-es8316-kernel-panic.patch
rename to patch/kernel/archive/rockchip64-5.17/general-fix-es8316-kernel-panic.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-fix-mmc-signal-voltage-before-reboot.patch b/patch/kernel/archive/rockchip64-5.17/general-fix-mmc-signal-voltage-before-reboot.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-fix-mmc-signal-voltage-before-reboot.patch
rename to patch/kernel/archive/rockchip64-5.17/general-fix-mmc-signal-voltage-before-reboot.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-increasing_DMA_block_memory_allocation_to_2048.patch b/patch/kernel/archive/rockchip64-5.17/general-increasing_DMA_block_memory_allocation_to_2048.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-increasing_DMA_block_memory_allocation_to_2048.patch
rename to patch/kernel/archive/rockchip64-5.17/general-increasing_DMA_block_memory_allocation_to_2048.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-possibility-of-disabling-rk808-rtc.patch b/patch/kernel/archive/rockchip64-5.17/general-possibility-of-disabling-rk808-rtc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-possibility-of-disabling-rk808-rtc.patch
rename to patch/kernel/archive/rockchip64-5.17/general-possibility-of-disabling-rk808-rtc.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-rk808-configurable-switch-voltage-steps.patch b/patch/kernel/archive/rockchip64-5.17/general-rk808-configurable-switch-voltage-steps.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-rk808-configurable-switch-voltage-steps.patch
rename to patch/kernel/archive/rockchip64-5.17/general-rk808-configurable-switch-voltage-steps.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-rockchip-overlays.patch b/patch/kernel/archive/rockchip64-5.17/general-rockchip-overlays.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-rockchip-overlays.patch
rename to patch/kernel/archive/rockchip64-5.17/general-rockchip-overlays.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-rt5651-add-mclk.patch b/patch/kernel/archive/rockchip64-5.17/general-rt5651-add-mclk.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-rt5651-add-mclk.patch
rename to patch/kernel/archive/rockchip64-5.17/general-rt5651-add-mclk.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/general-workaround-broadcom-bt-serdev.patch b/patch/kernel/archive/rockchip64-5.17/general-workaround-broadcom-bt-serdev.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/general-workaround-broadcom-bt-serdev.patch
rename to patch/kernel/archive/rockchip64-5.17/general-workaround-broadcom-bt-serdev.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/need_checking/board-rockpis-0017-WIP-Sync-rockchip_i2s_tdm-to-BSP-tree.patch b/patch/kernel/archive/rockchip64-5.17/need_checking/board-rockpis-0017-WIP-Sync-rockchip_i2s_tdm-to-BSP-tree.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/need_checking/board-rockpis-0017-WIP-Sync-rockchip_i2s_tdm-to-BSP-tree.patch
rename to patch/kernel/archive/rockchip64-5.17/need_checking/board-rockpis-0017-WIP-Sync-rockchip_i2s_tdm-to-BSP-tree.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/need_checking/board-rockpis-0023-ASoC-rockchip-i2s-add-compatible-for-rk3308.patch b/patch/kernel/archive/rockchip64-5.17/need_checking/board-rockpis-0023-ASoC-rockchip-i2s-add-compatible-for-rk3308.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/need_checking/board-rockpis-0023-ASoC-rockchip-i2s-add-compatible-for-rk3308.patch
rename to patch/kernel/archive/rockchip64-5.17/need_checking/board-rockpis-0023-ASoC-rockchip-i2s-add-compatible-for-rk3308.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/need_checking/rk3328-gpu-opp-adjust-DMC.patch b/patch/kernel/archive/rockchip64-5.17/need_checking/rk3328-gpu-opp-adjust-DMC.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/need_checking/rk3328-gpu-opp-adjust-DMC.patch
rename to patch/kernel/archive/rockchip64-5.17/need_checking/rk3328-gpu-opp-adjust-DMC.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/overlays-00-add-oc-opp-rk3399.patch b/patch/kernel/archive/rockchip64-5.17/overlays-00-add-oc-opp-rk3399.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/overlays-00-add-oc-opp-rk3399.patch
rename to patch/kernel/archive/rockchip64-5.17/overlays-00-add-oc-opp-rk3399.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/overlays-01-add-oc-opp-rk3328.patch b/patch/kernel/archive/rockchip64-5.17/overlays-01-add-oc-opp-rk3328.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/overlays-01-add-oc-opp-rk3328.patch
rename to patch/kernel/archive/rockchip64-5.17/overlays-01-add-oc-opp-rk3328.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/regulator-add-fan53200-driver.patch b/patch/kernel/archive/rockchip64-5.17/regulator-add-fan53200-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/regulator-add-fan53200-driver.patch
rename to patch/kernel/archive/rockchip64-5.17/regulator-add-fan53200-driver.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3328-add-board-orangepi-r1-plus-lts.patch b/patch/kernel/archive/rockchip64-5.17/rk3328-add-board-orangepi-r1-plus-lts.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3328-add-board-orangepi-r1-plus-lts.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3328-add-board-orangepi-r1-plus-lts.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3328-add-dmc-driver.patch b/patch/kernel/archive/rockchip64-5.17/rk3328-add-dmc-driver.patch
similarity index 99%
rename from patch/kernel/archive/rockchip64-5.16/rk3328-add-dmc-driver.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3328-add-dmc-driver.patch
index ae30f499a7..e326997d37 100644
--- a/patch/kernel/archive/rockchip64-5.16/rk3328-add-dmc-driver.patch
+++ b/patch/kernel/archive/rockchip64-5.17/rk3328-add-dmc-driver.patch
@@ -632,8 +632,8 @@ index 3ca1ad0ec..2fe9340f2 100644
  obj-$(CONFIG_ARM_IMX8M_DDRC_DEVFREQ)	+= imx8m-ddrc.o
  obj-$(CONFIG_ARM_RK3399_DMC_DEVFREQ)	+= rk3399_dmc.o
 +obj-$(CONFIG_ARM_RK3328_DMC_DEVFREQ)	+= rk3328_dmc.o
- obj-$(CONFIG_ARM_TEGRA_DEVFREQ)		+= tegra30-devfreq.o
- obj-$(CONFIG_ARM_TEGRA20_DEVFREQ)	+= tegra20-devfreq.o
+ obj-$(CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ)	+= sun8i-a33-mbus.o
+ obj-$(CONFIG_ARM_TEGRA_DEVFREQ)	+= tegra30-devfreq.o
  
 diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c
 index 9a88faaf8..c034df869 100644
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3328-add-rga-node.patch b/patch/kernel/archive/rockchip64-5.17/rk3328-add-rga-node.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3328-add-rga-node.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3328-add-rga-node.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3328-dts-roc-cc-audio-supplies.patch b/patch/kernel/archive/rockchip64-5.17/rk3328-dts-roc-cc-audio-supplies.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3328-dts-roc-cc-audio-supplies.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3328-dts-roc-cc-audio-supplies.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3328-dtsi-add-rkvdec-node.patch b/patch/kernel/archive/rockchip64-5.17/rk3328-dtsi-add-rkvdec-node.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3328-dtsi-add-rkvdec-node.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3328-dtsi-add-rkvdec-node.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3328-dtsi-mali-opp-table.patch b/patch/kernel/archive/rockchip64-5.17/rk3328-dtsi-mali-opp-table.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3328-dtsi-mali-opp-table.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3328-dtsi-mali-opp-table.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3328-dtsi-mmc-reset-properties.patch b/patch/kernel/archive/rockchip64-5.17/rk3328-dtsi-mmc-reset-properties.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3328-dtsi-mmc-reset-properties.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3328-dtsi-mmc-reset-properties.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3328-dtsi-sdmmc-ext-node.patch b/patch/kernel/archive/rockchip64-5.17/rk3328-dtsi-sdmmc-ext-node.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3328-dtsi-sdmmc-ext-node.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3328-dtsi-sdmmc-ext-node.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3328-dtsi-spdif.patch b/patch/kernel/archive/rockchip64-5.17/rk3328-dtsi-spdif.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3328-dtsi-spdif.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3328-dtsi-spdif.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3328-dtsi-usb3-reset-properties.patch b/patch/kernel/archive/rockchip64-5.17/rk3328-dtsi-usb3-reset-properties.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3328-dtsi-usb3-reset-properties.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3328-dtsi-usb3-reset-properties.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3328-gpu-cooling-target.patch b/patch/kernel/archive/rockchip64-5.17/rk3328-gpu-cooling-target.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3328-gpu-cooling-target.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3328-gpu-cooling-target.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3399-add-sclk-i2sout-src-clock.patch b/patch/kernel/archive/rockchip64-5.17/rk3399-add-sclk-i2sout-src-clock.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3399-add-sclk-i2sout-src-clock.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3399-add-sclk-i2sout-src-clock.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch b/patch/kernel/archive/rockchip64-5.17/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3399-pci-rockchip-support-ep-gpio-undefined-case.patch b/patch/kernel/archive/rockchip64-5.17/rk3399-pci-rockchip-support-ep-gpio-undefined-case.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3399-pci-rockchip-support-ep-gpio-undefined-case.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3399-pci-rockchip-support-ep-gpio-undefined-case.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-5.17/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3399-sd-drive-level-8ma.patch b/patch/kernel/archive/rockchip64-5.17/rk3399-sd-drive-level-8ma.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3399-sd-drive-level-8ma.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3399-sd-drive-level-8ma.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/rk3399-unlock-temperature.patch b/patch/kernel/archive/rockchip64-5.17/rk3399-unlock-temperature.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/rk3399-unlock-temperature.patch
rename to patch/kernel/archive/rockchip64-5.17/rk3399-unlock-temperature.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/wifi-4001-add-realtek-8723cs-kconfig-makefile.patch b/patch/kernel/archive/rockchip64-5.17/wifi-4001-add-realtek-8723cs-kconfig-makefile.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/wifi-4001-add-realtek-8723cs-kconfig-makefile.patch
rename to patch/kernel/archive/rockchip64-5.17/wifi-4001-add-realtek-8723cs-kconfig-makefile.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/wifi-4002-add-realtek-8723cs.patch b/patch/kernel/archive/rockchip64-5.17/wifi-4002-add-realtek-8723cs.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/wifi-4002-add-realtek-8723cs.patch
rename to patch/kernel/archive/rockchip64-5.17/wifi-4002-add-realtek-8723cs.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/wifi-4002-realtek-8723cs-Fix-IEEE80211_MAX_AMPDU_BUF.patch b/patch/kernel/archive/rockchip64-5.17/wifi-4002-realtek-8723cs-Fix-IEEE80211_MAX_AMPDU_BUF.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/wifi-4002-realtek-8723cs-Fix-IEEE80211_MAX_AMPDU_BUF.patch
rename to patch/kernel/archive/rockchip64-5.17/wifi-4002-realtek-8723cs-Fix-IEEE80211_MAX_AMPDU_BUF.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/wifi-hf-lps170-bl602-kconfig-makefile.patch b/patch/kernel/archive/rockchip64-5.17/wifi-hf-lps170-bl602-kconfig-makefile.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/wifi-hf-lps170-bl602-kconfig-makefile.patch
rename to patch/kernel/archive/rockchip64-5.17/wifi-hf-lps170-bl602-kconfig-makefile.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/wifi-hf-lps170-bl602.patch b/patch/kernel/archive/rockchip64-5.17/wifi-hf-lps170-bl602.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/wifi-hf-lps170-bl602.patch
rename to patch/kernel/archive/rockchip64-5.17/wifi-hf-lps170-bl602.patch
diff --git a/patch/kernel/archive/rockchip64-5.16/workaround-need-proper-adjustement-for-reading-MAC-f.patch b/patch/kernel/archive/rockchip64-5.17/workaround-need-proper-adjustement-for-reading-MAC-f.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-5.16/workaround-need-proper-adjustement-for-reading-MAC-f.patch
rename to patch/kernel/archive/rockchip64-5.17/workaround-need-proper-adjustement-for-reading-MAC-f.patch
diff --git a/patch/kernel/rockchip64-edge b/patch/kernel/rockchip64-edge
index 5a050be03b..4b954d3325 120000
--- a/patch/kernel/rockchip64-edge
+++ b/patch/kernel/rockchip64-edge
@@ -1 +1 @@
-archive/rockchip64-5.16
\ No newline at end of file
+archive/rockchip64-5.17
\ No newline at end of file