diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-27 16:03:00 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-27 16:03:00 +0200 |
| commit | a92403ad4bf905c056903b02ef2c1eba904887b5 (patch) | |
| tree | 4d12b8d859e377bfe8ac4b12fdcfc558f031b691 | |
| parent | 62f5bb2a4d26a579929941cb0904caa3c5b94478 (diff) | |
| parent | ae660337621795ed6f30ff4f5f2adce2dea22789 (diff) | |
| download | kernel-a92403ad4bf905c056903b02ef2c1eba904887b5.tar.gz kernel-a92403ad4bf905c056903b02ef2c1eba904887b5.tar.xz kernel-a92403ad4bf905c056903b02ef2c1eba904887b5.zip | |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
| -rwxr-xr-x | kernel.spec | 6 | ||||
| -rw-r--r-- | patch-5.16-redhat.patch | 24 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 12 insertions, 24 deletions
diff --git a/kernel.spec b/kernel.spec index 34cfc6fc4..f6f19fc3e 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2990,6 +2990,12 @@ fi # # %changelog +* Wed Mar 23 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.17-100] +- Fix up changelog (Justin M. Forbes) + +* Wed Mar 23 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.17-0] +- Linux v5.16.17 + * 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) diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index 721733a71..87ffea7f0 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -16,7 +16,6 @@ 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 ++++ @@ -54,10 +53,10 @@ security/lockdown/lockdown.c | 1 + security/security.c | 6 + tools/testing/selftests/netfilter/nft_nat.sh | 5 +- - 56 files changed, 824 insertions(+), 287 deletions(-) + 55 files changed, 821 insertions(+), 284 deletions(-) diff --git a/Makefile b/Makefile -index d625d3aeab2e..6e8bdceb7395 100644 +index 0ca39c16b3bf..5e51ad0402d1 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -667,7 +666,7 @@ index c02ff25dd477..d860f8eb9a81 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index 7de3f5b6e8d0..95b1c35b347c 100644 +index 5502e176d51b..93b61ca552d6 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -31,6 +31,7 @@ @@ -855,23 +854,6 @@ 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.16.tar.xz) = 554cc9dabce0d9b351b6c2b854fe6175a3a55662578a3129ebba8d9a856fdd1baaf2c6203d5aa674346f20674279958db59c8a7acb9797640505beae5745490c -SHA512 (kernel-abi-stablelists-5.16.16-100.tar.bz2) = c9f341321ff45169ecde2f7f8a42cc1cd598b19749445433fa3b0ef0292f78806d32e16146a9d13308347a38abed16b241ab1d3d393894572ad99f6d64eca957 -SHA512 (kernel-kabi-dw-5.16.16-100.tar.bz2) = 30fd65ebceadf8f23051a8b4514e6bda8b66f69d3f9ddd686549a6b9c8e1bb8f874de45a2112fdae5b7bde6580d284ead858455e7a78a693ddec36b8050bfdf4 +SHA512 (linux-5.16.17.tar.xz) = 94b6b5fbd0beeee57be06205e568779d9e87116274f8ca958874c26445c60fdedc09c2137b424b524572992ee1a8b0e4cb3af5b461e0e4c4554615b7607bf8b5 +SHA512 (kernel-abi-stablelists-5.16.17-100.tar.bz2) = cf7976832c0457cca59febf20af215784c7436296b99ac624e3dd8ee3d24e0651bd369db9c4f2c8f9700223b63d046ca3491ba6987c0cbd28b2cd921e7b633d0 +SHA512 (kernel-kabi-dw-5.16.17-100.tar.bz2) = eac3ce7bbfea8fe9d7fbac3edc9bc301fdd9af9958a3e54b4d5652f71f066511e7099b7026258b7fc929a383ceeb329dc8d5bb358aa8997fd1d9ae8117b5c5c8 |