diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-21 16:21:22 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-21 16:21:22 +0100 |
| commit | a25539e8f585531efe964096cea8d4aa614b204f (patch) | |
| tree | 71d2c61334822af013296d7e731b0a4a1bc28ee6 | |
| parent | d9382a7d0c1cd98a6b17f0de5c3f29b85cdafbf9 (diff) | |
| parent | 95484c155424c62930acc1c61803f608af3f1cbc (diff) | |
| download | kernel-a25539e8f585531efe964096cea8d4aa614b204f.tar.gz kernel-a25539e8f585531efe964096cea8d4aa614b204f.tar.xz kernel-a25539e8f585531efe964096cea8d4aa614b204f.zip | |
merge origin
| -rw-r--r-- | Makefile.rhelver | 2 | ||||
| -rw-r--r-- | Patchlist.changelog | 3 | ||||
| -rwxr-xr-x | kernel.spec | 7 | ||||
| -rw-r--r-- | patch-5.16-redhat.patch | 22 | ||||
| -rw-r--r-- | sources | 6 |
5 files changed, 32 insertions, 8 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index a3e9c2e38..8e6ba0821 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 1 +RHEL_RELEASE = 0 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index f8229093f..9dd29dbcd 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/dfe21b33039e0c863a4e41a8e8508fa6af46bad8 + dfe21b33039e0c863a4e41a8e8508fa6af46bad8 drm/mgag200: Fix PLL setup for g200wb and g200ew + https://gitlab.com/cki-project/kernel-ark/-/commit/dd24222299c0cc5a6a118f2265fcf3f769a7cfb4 dd24222299c0cc5a6a118f2265fcf3f769a7cfb4 Back out the nfs workaround and just revert the query for fs_location diff --git a/kernel.spec b/kernel.spec index 19da4f552..7578cf982 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 201 +%global distro_build 200 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -135,7 +135,7 @@ Summary: The Linux kernel %define rpmversion 5.16.16 %define patchversion 5.16 -%define pkgrelease 201 +%define pkgrelease 200 # This is needed to do merge window version magic %define patchlevel 16 @@ -2990,6 +2990,9 @@ fi # # %changelog +* Sat Mar 19 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.16-0] +- drm/mgag200: Fix PLL setup for g200wb and g200ew (Jocelyn Falempe) + * Thu Mar 17 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.15-1] - Back out the nfs workaround and just revert the query for fs_location (Justin M. Forbes) diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index e1959a191..721733a71 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -16,6 +16,7 @@ drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 124 +++++++++++++++------ drivers/firmware/efi/secureboot.c | 38 +++++++ + drivers/gpu/drm/mgag200/mgag200_pll.c | 6 +- drivers/gpu/drm/nouveau/nouveau_backlight.c | 3 +- drivers/hid/hid-rmi.c | 64 ----------- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++ @@ -53,10 +54,10 @@ security/lockdown/lockdown.c | 1 + security/security.c | 6 + tools/testing/selftests/netfilter/nft_nat.sh | 5 +- - 55 files changed, 821 insertions(+), 284 deletions(-) + 56 files changed, 824 insertions(+), 287 deletions(-) diff --git a/Makefile b/Makefile -index 8675dd2a9cc8..fae0fa3f7ed5 100644 +index d625d3aeab2e..6e8bdceb7395 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -854,6 +855,23 @@ index 000000000000..de0a3714a5d4 + } + } +} +diff --git a/drivers/gpu/drm/mgag200/mgag200_pll.c b/drivers/gpu/drm/mgag200/mgag200_pll.c +index e9ae22b4f813..52be08b744ad 100644 +--- a/drivers/gpu/drm/mgag200/mgag200_pll.c ++++ b/drivers/gpu/drm/mgag200/mgag200_pll.c +@@ -404,9 +404,9 @@ mgag200_pixpll_update_g200wb(struct mgag200_pll *pixpll, const struct mgag200_pl + udelay(50); + + /* program pixel pll register */ +- WREG_DAC(MGA1064_PIX_PLLC_N, xpixpllcn); +- WREG_DAC(MGA1064_PIX_PLLC_M, xpixpllcm); +- WREG_DAC(MGA1064_PIX_PLLC_P, xpixpllcp); ++ WREG_DAC(MGA1064_WB_PIX_PLLC_N, xpixpllcn); ++ WREG_DAC(MGA1064_WB_PIX_PLLC_M, xpixpllcm); ++ WREG_DAC(MGA1064_WB_PIX_PLLC_P, xpixpllcp); + + udelay(50); + diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c index 1cbd71abc80a..9d2513de959b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c @@ -1,3 +1,3 @@ -SHA512 (linux-5.16.15.tar.xz) = 2bb60417bfcff772de12419a4279eb21139871cad5cd800e295832b646f75b2e751115dda1ceb8344465a1f263a782f7e6dc45362433caf7bab3c164b7f78d7f -SHA512 (kernel-abi-stablelists-5.16.15-201.tar.bz2) = be6d7dbcbbcca55fb70375fe9838e1504fee9d79dfc21dceeb0c5a5bf81573d9058e6ef6267c425fa922dfa077710c1388c13c62490552affc31c66f6482e406 -SHA512 (kernel-kabi-dw-5.16.15-201.tar.bz2) = 7a07aa18af068537bd31ed63bdd796d3bc7510ad29bb5428546bbaa93a866aea193ba127058904f9fc257c01b2fb072b8d27f2ac8b845e483d7e92b0e4f4deca +SHA512 (linux-5.16.16.tar.xz) = 554cc9dabce0d9b351b6c2b854fe6175a3a55662578a3129ebba8d9a856fdd1baaf2c6203d5aa674346f20674279958db59c8a7acb9797640505beae5745490c +SHA512 (kernel-abi-stablelists-5.16.16-200.tar.bz2) = 998051a96d9c393e460178f9b9d6add3984ba915f30249cb143ac0bc34b55d157d0dd3612d515125ed692a8606e441bf58879e9f490cc3a3b9811c3a7e70ed28 +SHA512 (kernel-kabi-dw-5.16.16-200.tar.bz2) = 30fd65ebceadf8f23051a8b4514e6bda8b66f69d3f9ddd686549a6b9c8e1bb8f874de45a2112fdae5b7bde6580d284ead858455e7a78a693ddec36b8050bfdf4 |