diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-18 19:51:51 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-18 19:51:51 +0200 |
commit | aae208c12f61545f388c2e6d1f22c30ec858c293 (patch) | |
tree | 7a6f6fa03b1360b9df7f2150bd337fa33a9ff8d5 /0001-put-RHEL-info-into-generated-headers.patch | |
parent | 81b1269020cd33317e9c61de223f735c3ef35525 (diff) | |
parent | 8bcec8d9026ed6b2c51c7947c2e28628e701dfe8 (diff) | |
download | kernel-aae208c12f61545f388c2e6d1f22c30ec858c293.tar.gz kernel-aae208c12f61545f388c2e6d1f22c30ec858c293.tar.xz kernel-aae208c12f61545f388c2e6d1f22c30ec858c293.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc6.1.vanilla.1.fc33kernel-5.7.0-0.rc6.1.vanilla.1.fc32kernel-5.7.0-0.rc6.1.vanilla.1.fc31kernel-5.7.0-0.rc6.1.vanilla.1.fc30
Diffstat (limited to '0001-put-RHEL-info-into-generated-headers.patch')
-rw-r--r-- | 0001-put-RHEL-info-into-generated-headers.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-put-RHEL-info-into-generated-headers.patch b/0001-put-RHEL-info-into-generated-headers.patch index 4908fca71..4f63d2927 100644 --- a/0001-put-RHEL-info-into-generated-headers.patch +++ b/0001-put-RHEL-info-into-generated-headers.patch @@ -59,7 +59,7 @@ Acked-by: Prarit Bhargava <prarit@redhat.com> 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 11fe9b1535de..4a9877c61db5 100644 +index 04f5662ae61a..266cc438f200 100644 --- a/Makefile +++ b/Makefile @@ -1190,7 +1190,13 @@ endef |