diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-09-23 14:41:50 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-09-23 14:41:50 +0200 |
| commit | 13cfe59af8da5e59fb7733217bc545f2d8cb13c2 (patch) | |
| tree | 5790a22cee20eb88bc789dc1a80a6f3b9dd57c65 /patch-5.19-redhat.patch | |
| parent | 8998acfe539914f4c3192ba92ca86361aaab1814 (diff) | |
| parent | 6b967836069c0e546a70e54a9cbfbebac9cafea3 (diff) | |
| download | kernel-13cfe59af8da5e59fb7733217bc545f2d8cb13c2.tar.gz kernel-13cfe59af8da5e59fb7733217bc545f2d8cb13c2.tar.xz kernel-13cfe59af8da5e59fb7733217bc545f2d8cb13c2.zip | |
Merge remote-tracking branch 'origin/f36' into f36-user-thl-vanilla-fedora
Diffstat (limited to 'patch-5.19-redhat.patch')
| -rw-r--r-- | patch-5.19-redhat.patch | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch index 0b4a8c246..1472d6f5b 100644 --- a/patch-5.19-redhat.patch +++ b/patch-5.19-redhat.patch @@ -56,12 +56,13 @@ init/Kconfig | 2 +- kernel/module/signing.c | 9 +- net/bluetooth/hci_event.c | 20 + + scripts/pahole-flags.sh | 4 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 63 files changed, 1777 insertions(+), 349 deletions(-) + 64 files changed, 1781 insertions(+), 349 deletions(-) diff --git a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml index e6485f7b046f..217c42874f41 100644 @@ -253,7 +254,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index 1f27c4bd09e6..ec5fbc9dc8ae 100644 +index 33a9b6b547c4..f16045bf3888 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -3305,6 +3306,19 @@ index 2c320a8fe70d..e097bf4ce549 100644 if (i == ARRAY_SIZE(hci_cc_table)) { /* Unknown opcode, assume byte 0 contains the status, so +diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh +index 0d99ef17e4a5..d4f3d63cb434 100755 +--- a/scripts/pahole-flags.sh ++++ b/scripts/pahole-flags.sh +@@ -20,4 +20,8 @@ if [ "${pahole_ver}" -ge "122" ]; then + extra_paholeopt="${extra_paholeopt} -j" + fi + ++if [ "${pahole_ver}" -ge "124" ]; then ++ extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64" ++fi ++ + echo ${extra_paholeopt} diff --git a/scripts/tags.sh b/scripts/tags.sh index 01fab3d4f90b..2ae5dfc904f9 100755 --- a/scripts/tags.sh |