diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
commit | f7ba01a9677fffa21535bc6cdcad930a858d6106 (patch) | |
tree | 6eb6df39221f8926b813d63b41ffed9da18e6a5d /0001-redhat-rh_kabi-Add-macros-to-size-and-extend-structs.patch | |
parent | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (diff) | |
parent | 6c2cc50051831fa502a8b082a312ca90e7039f3f (diff) | |
download | kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.gz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.xz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.zip |
merge masterkernel-5.7.0-0.rc3.1.vanilla.1.fc33kernel-5.7.0-0.rc3.1.vanilla.1.fc32kernel-5.7.0-0.rc3.1.vanilla.1.fc31kernel-5.7.0-0.rc3.1.vanilla.1.fc30
Diffstat (limited to '0001-redhat-rh_kabi-Add-macros-to-size-and-extend-structs.patch')
-rw-r--r-- | 0001-redhat-rh_kabi-Add-macros-to-size-and-extend-structs.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0001-redhat-rh_kabi-Add-macros-to-size-and-extend-structs.patch b/0001-redhat-rh_kabi-Add-macros-to-size-and-extend-structs.patch index 4561538bf..187013341 100644 --- a/0001-redhat-rh_kabi-Add-macros-to-size-and-extend-structs.patch +++ b/0001-redhat-rh_kabi-Add-macros-to-size-and-extend-structs.patch @@ -1,4 +1,4 @@ -From cedb6dec3b60ec7c9bd8b2c87c4883db9ac53ed8 Mon Sep 17 00:00:00 2001 +From 885d477a0cf6e22a60c043c7b6b27c4667f8a4c3 Mon Sep 17 00:00:00 2001 From: Prarit Bhargava <prarit@redhat.com> Date: Wed, 19 Feb 2020 11:52:16 +0100 Subject: [PATCH] redhat: rh_kabi: Add macros to size and extend structs @@ -128,9 +128,9 @@ index 87f2bd530df7..d551df994583 100644 --- a/include/linux/rh_kabi.h +++ b/include/linux/rh_kabi.h @@ -186,4 +186,68 @@ - + #define RH_KABI_EXCLUDE(_elem) _RH_KABI_EXCLUDE(_elem); - + +/* + * RHEL macros to extend structs. + * @@ -197,5 +197,5 @@ index 87f2bd530df7..d551df994583 100644 + #endif /* _LINUX_RH_KABI_H */ -- -2.26.0 +2.26.2 |