diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-06 10:33:10 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-06 10:33:10 +0200 |
| commit | d0e7b6eed8189ef2774aa3d602792fac3d686df0 (patch) | |
| tree | 435c70ea8dd381f0ecc0fce2e495ab2f53f3dba5 | |
| parent | 8b490a8a5faf9bf1c6ac002a1f8b9a5024c80a1b (diff) | |
| parent | a0207fa499c4956227f9accaa5dce7587ca0ad8f (diff) | |
| download | kernel-d0e7b6eed8189ef2774aa3d602792fac3d686df0.tar.gz kernel-d0e7b6eed8189ef2774aa3d602792fac3d686df0.tar.xz kernel-d0e7b6eed8189ef2774aa3d602792fac3d686df0.zip | |
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
| -rw-r--r-- | patch-5.18-redhat.patch | 12 | ||||
| -rw-r--r-- | sources | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch index ef24e050a..796930435 100644 --- a/patch-5.18-redhat.patch +++ b/patch-5.18-redhat.patch @@ -44,7 +44,7 @@ 43 files changed, 712 insertions(+), 191 deletions(-) diff --git a/Makefile b/Makefile -index 7d5b0bfe7960..52df3d8781ee 100644 +index 2bb168acb8f4..d4a8ca96e4a2 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1622,10 +1622,10 @@ index ab7eea01ab42..fff7c5f737fc 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index 25b3ef71f495..d37a6c88c69f 100644 +index 7fc4e9f49f54..6f0b0b2dc73d 100644 --- a/include/linux/security.h +++ b/include/linux/security.h -@@ -471,6 +471,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); +@@ -473,6 +473,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen); int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen); int security_locked_down(enum lockdown_reason what); @@ -1633,7 +1633,7 @@ index 25b3ef71f495..d37a6c88c69f 100644 #else /* CONFIG_SECURITY */ static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data) -@@ -1347,6 +1348,10 @@ static inline int security_locked_down(enum lockdown_reason what) +@@ -1349,6 +1350,10 @@ static inline int security_locked_down(enum lockdown_reason what) { return 0; } @@ -1752,10 +1752,10 @@ index 87cbdc64d272..18555cf18da7 100644 static int __init lockdown_lsm_init(void) diff --git a/security/security.c b/security/security.c -index b7cf5cbfdc67..3cde9062fcf6 100644 +index aaf6566deb9f..86926966c15d 100644 --- a/security/security.c +++ b/security/security.c -@@ -2623,6 +2623,12 @@ int security_locked_down(enum lockdown_reason what) +@@ -2625,6 +2625,12 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294 -SHA512 (linux-5.18.tar.xz) = cb327559179b4f611ca5d2458bb62bfc0b06337a15af1a44ef754937240fbb26a39b86f03afaac47a963bf376a26e39f7f78db1b703e9061f4af7c9fc8b91f83 -SHA512 (kernel-abi-stablelists-5.18.0-200.tar.bz2) = 57b902255941f7385486091006130564a2adad458e7c8ae3a85716b061f35e3ac6f3b80664d15566f2dc5c73b4364a8de73430572010e2eb5622c55c329a7c55 -SHA512 (kernel-kabi-dw-5.18.0-200.tar.bz2) = 1a19073248b8399a785bfe403c9468df3c666c42a55ab07cd3c3072289441c737b35d2b8c81ba3e8c80c0fbc605b916d63a84bcf85a32707c5f63f35f62a7d5e +SHA512 (linux-5.18.1.tar.xz) = bf0b8f7525f0ccc20b359736e694e953e0c28881fb886cdfdec1c800e8cae8ac8d495a66e104f8dd86054688c31874b0e17a0e5e7141e8f00cd2e338b51a3986 +SHA512 (kernel-abi-stablelists-5.18.1-200.tar.bz2) = 2733a09b9032a311bfa80e412691978c9b75112de35fba1b1c9001b01a3031019cec4c232d95ddcce4b59fc1f9aefd11c79c7030244e964e05b936ad75555a80 +SHA512 (kernel-kabi-dw-5.18.1-200.tar.bz2) = 92d19a7604057d7c6997250dd0313b8a8d0b1d664dc99d022e4e8230d84cd1157ef954ff3cea4e9c3f98c2ab54126b48b12d6a92c36d6188223366ef431b55f0 |