2 files changed, 7 insertions, 29 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b7ea61c5..e24e14e1 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -412,13 +412,13 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm-nxp-bsp  ?= "imx-gst1.0-plugin"
 MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin"
 MACHINE_GSTREAMER_1_0_PLUGIN:mx8dx-nxp-bsp  ?= "imx-gst1.0-plugin"
 
-PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp              ??= "1.20.2.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.20.2.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.20.2.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp  ??= "1.20.2.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.20.2"
-PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp        ??= "1.20.2"
-PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp  ??= "1.20.2"
+PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp              ??= "1.18.5.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.18.5.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.18.5.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp  ??= "1.18.5.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.18.5"
+PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp        ??= "1.18.5"
+PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp  ??= "1.18.5"
 PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp                    ??= "4.4.1"
 
 # Determines if the SoC has support for Vivante kernel driver
diff --git a/v5.15.48-v5.15.47.log b/v5.15.48-v5.15.47.log
deleted file mode 100644
index ceebe069..00000000
--- a/v5.15.48-v5.15.47.log
+++ /dev/null
@@ -1,22 +0,0 @@
-linux-fslc-imx: update to v5.15.48
-
-Kernel repository has been upgraded up to v5.15.48 from stable korg.
-
-Following upstream commits are included in this version:
-----
-e1dd58c995da Linux 5.15.48
-147ae04a7c52 x86/speculation/mmio: Print SMT warning
-59d665a709b0 KVM: x86/speculation: Disable Fill buffer clear within guests
-ebd0f558b480 x86/speculation/mmio: Reuse SRBDS mitigation for SBDS
-30120b433c1f x86/speculation/srbds: Update SRBDS mitigation selection
-531eb5fe3171 x86/speculation/mmio: Add sysfs reporting for Processor MMIO Stale Data
-2044838ab228 x86/speculation/mmio: Enable CPU Fill buffer clearing on idle
-407d97b99f27 x86/bugs: Group MDS, TAA & Processor MMIO Stale Data mitigations
-d74f4eb1ddf0 x86/speculation/mmio: Add mitigation for Processor MMIO Stale Data
-8b9521e71179 x86/speculation: Add a common function for MD_CLEAR mitigation update
-d822b10f97f6 x86/speculation/mmio: Enumerate Processor MMIO Stale Data bug
-1fcc3d646f0b Documentation: Add documentation for Processor MMIO Stale Data
-----
-
-Link: https://lore.kernel.org/r/20220614183720.512073672@linuxfoundation.org # v5.15.48
-Link: https://github.com/Freescale/linux-fslc/pull/587