linux-next: manual merge of the landlock tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the landlock tree got a conflict in:

  kernel/printk/sysctl.c

between commit:

  1f2cfdd349b7 ("printk: Fix incorrect __user type in proc_dointvec_minmax_sysadmin()")

from Linus' tree and commit:

  c96303ec34ab ("printk: Move back proc_dointvec_minmax_sysadmin() to sysctl.c")

from the landlock tree.

I fixed it up (I used the letter version and then added the following
merge fix patch) and can carry the fix as necessary. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging.  You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 4 Feb 2022 13:13:51 +1100
Subject: [PATCH] fix up for "printk: Fix incorrect __user type in proc_dointvec_minmax_sysadmin()"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 kernel/sysctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 2e2027e323fd..39e45a602e97 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -889,7 +889,7 @@ static int proc_taint(struct ctl_table *table, int write,
 }
 
 int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
-				void __user *buffer, size_t *lenp, loff_t *ppos)
+				void *buffer, size_t *lenp, loff_t *ppos)
 {
 	if (write && !capable(CAP_SYS_ADMIN))
 		return -EPERM;
-- 
2.34.1

-- 
Cheers,
Stephen Rothwell

Attachment: pgpwfJgJ1iqD7.pgp
Description: OpenPGP digital signature