diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-26 11:50:55 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-26 11:50:55 +0200 |
| commit | b359414152452a4b334d3dd24dabb9cc06d2415d (patch) | |
| tree | fc4a389ec901eb930b2f5f0a78f07f7dfdddfef3 | |
| parent | fac3d92c844d774ef3f0bdaac460832862c3f1ba (diff) | |
| parent | 20f434ce5fd97223f0b70dfd8c3cdec429d32332 (diff) | |
| download | kernel-b359414152452a4b334d3dd24dabb9cc06d2415d.tar.gz kernel-b359414152452a4b334d3dd24dabb9cc06d2415d.tar.xz kernel-b359414152452a4b334d3dd24dabb9cc06d2415d.zip | |
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedora
| -rw-r--r-- | Patchlist.changelog | 3 | ||||
| -rwxr-xr-x | kernel.spec | 3 | ||||
| -rw-r--r-- | patch-5.12-redhat.patch | 4 | ||||
| -rw-r--r-- | sources | 6 |
4 files changed, 11 insertions, 5 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog index 0dcaa27ee..e0e542c6e 100644 --- a/Patchlist.changelog +++ b/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/kernel.spec b/kernel.spec index 7d4d03c02..a33867afd 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2797,6 +2797,9 @@ fi # # %changelog +* 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) - fedora: enable zonefs (Damien Le Moal) diff --git a/patch-5.12-redhat.patch b/patch-5.12-redhat.patch index 5f42bae10..c8ad8abe9 100644 --- a/patch-5.12-redhat.patch +++ b/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 @@ @@ -1,3 +1,3 @@ -SHA512 (linux-5.12.5.tar.xz) = 0ea869ac6e6c1ce571eaa6d1b4273bbea7bcdd1a66f68c33a83355ee3990a48b635bf7498d4f1137ab612e84a3f730012b519a651dea897a46c12f1392b877f0 -SHA512 (kernel-abi-whitelists-5.12.5-200.tar.bz2) = cd13a305a98fd7aae7242d658c575b8805cf266a7b12c3c5d591fae4a72234976f4863ea537baf52c5c7c330e010b288769d8a2a50d9f4e43db8432a00ce410d -SHA512 (kernel-kabi-dw-5.12.5-200.tar.bz2) = 7633d58e2d8fda3eabe905138ead17808aaa538e80843a6dacecc99bd44e4173750222aef1772bb1cbb6e2ad4785cf3e4b84451d1eedcf8a0f612f246d6d3520 +SHA512 (linux-5.12.6.tar.xz) = d32118c20439e68b00c5a57ace70049272753263e3d6e9a48483995f42cf7b2256fb3c4017525d32281151d68a0d8e79192b209f200e42e60bce99f07ed13398 +SHA512 (kernel-abi-whitelists-5.12.6-200.tar.bz2) = afa188339895680fad94f05e2b533927b6ece83d85a23fa6e0bdad86c9e3e8827b782fe3b492601e2172a2031f004e32f519c06b69e1d2a81181076296ebb062 +SHA512 (kernel-kabi-dw-5.12.6-200.tar.bz2) = 99eb304cae38c04da82273e0897a239e39c7b4c50f1ededfff49f19867b263d1b5fb7d792ff68a5f14c5206410196c44b129f510f38b0d2065aa685bd23ee41c |