summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan200101 <sentrycraft123@gmail.com>2021-05-25 20:22:40 +0200
committerJan200101 <sentrycraft123@gmail.com>2021-05-25 20:22:40 +0200
commit467be6e8d4b16b08ee4da55a0351b50449fc1bcd (patch)
tree6abdb554a01e10f66c8ef8634c3fbe1cb4e0b6a3
parent24c0840ef449755c50bc40a643c27c720f7a6135 (diff)
downloadkernel-fsync-467be6e8d4b16b08ee4da55a0351b50449fc1bcd.tar.gz
kernel-fsync-467be6e8d4b16b08ee4da55a0351b50449fc1bcd.zip
kernel 5.12.6
-rw-r--r--SOURCES/Patchlist.changelog3
-rw-r--r--SOURCES/patch-5.12-redhat.patch4
-rwxr-xr-xSPECS/kernel.spec15
3 files changed, 14 insertions, 8 deletions
diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog
index 0dcaa27..e0e542c 100644
--- a/SOURCES/Patchlist.changelog
+++ b/SOURCES/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/00f96bf907caf6f5bd6ff876958aa9a1bb45f969
+ 00f96bf907caf6f5bd6ff876958aa9a1bb45f969 bus: mhi: core: Download AMSS image from appropriate function
+
https://gitlab.com/cki-project/kernel-ark/-/commit/8ce924d893c80e34cbe65310fe1389e7ab4d808c
8ce924d893c80e34cbe65310fe1389e7ab4d808c drm/rockchip: remove existing generic drivers to take over the device
diff --git a/SOURCES/patch-5.12-redhat.patch b/SOURCES/patch-5.12-redhat.patch
index 5f42bae..c8ad8ab 100644
--- a/SOURCES/patch-5.12-redhat.patch
+++ b/SOURCES/patch-5.12-redhat.patch
@@ -66,7 +66,7 @@ index 75a9dd98e76e..3ff3291551f9 100644
Boot into System Kernel
diff --git a/Makefile b/Makefile
-index f60212a0412c..7424a878605f 100644
+index dd021135838b..834afa29b14c 100644
--- a/Makefile
+++ b/Makefile
@@ -495,6 +495,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
@@ -1027,7 +1027,7 @@ index a751553fa0db..dbb981876556 100644
+obj-$(CONFIG_ARM64) += pcie-tegra194.o
endif
diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 6fa216e52d14..cb38e94a3033 100644
+index 0e94190ca4e8..dfc5d6772e64 100644
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -22,6 +22,8 @@
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index c388224..0bff12c 100755
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -106,7 +106,7 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-%define rpmversion 5.12.5
+%define rpmversion 5.12.6
%define stableversion 5.12
%define pkgrelease 301
@@ -623,7 +623,7 @@ BuildRequires: clang
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.12.5.tar.xz
+Source0: linux-5.12.6.tar.xz
Source1: Makefile.rhelver
@@ -1281,8 +1281,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.12.5 -c
-mv linux-5.12.5 linux-%{KVERREL}
+%setup -q -n kernel-5.12.6 -c
+mv linux-5.12.6 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2800,8 +2800,11 @@ fi
#
#
%changelog
-* Fri May 21 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.12.5-301.fsync
-- Linux v5.12.5 futex2 zen
+* Tue May 25 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.12.6-301.fsync
+- Linux v5.12.6 futex2 zen
+
+* Sat May 22 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.6-0]
+- bus: mhi: core: Download AMSS image from appropriate function (Bhaumik Bhatt)
* Wed May 19 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.5-0]
- drm/rockchip: remove existing generic drivers to take over the device (Javier Martinez Canillas)