diff options
Diffstat (limited to 'patch-5.16-redhat.patch')
| -rw-r--r-- | patch-5.16-redhat.patch | 24 |
1 files changed, 3 insertions, 21 deletions
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 |