archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Al Viro <>, Michael Ellerman <>
Cc: PowerPC <>,
	Linux Next Mailing List <>,
	Linux Kernel Mailing List <>,
	"Aneesh Kumar K.V" <>
Subject: linux-next: manual merge of the vfs tree with the powerpc tree
Date: Mon, 27 Jul 2020 11:32:16 +1000	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 2065 bytes --]

Hi all,

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


between commit:

  e0d8e991be64 ("powerpc/book3s64/kuap: Move UAMOR setup to key init function")

from the powerpc tree and commit:

  5e39a71bddb3 ("powerpc: switch to ->regset_get()")

from the vfs tree.

I fixed it up (I thnk - see below) 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.

Stephen Rothwell

diff --cc arch/powerpc/kernel/ptrace/ptrace-view.c
index ac7d480cb9c1,13208a9a02ca..000000000000
--- a/arch/powerpc/kernel/ptrace/ptrace-view.c
+++ b/arch/powerpc/kernel/ptrace/ptrace-view.c
@@@ -486,23 -468,15 +468,15 @@@ static int pkey_active(struct task_stru
  static int pkey_get(struct task_struct *target, const struct user_regset *regset,
- 		    unsigned int pos, unsigned int count, void *kbuf, void __user *ubuf)
+ 		    struct membuf to)
- 	int ret;
  	BUILD_BUG_ON(TSO(amr) + sizeof(unsigned long) != TSO(iamr));
 -	BUILD_BUG_ON(TSO(iamr) + sizeof(unsigned long) != TSO(uamor));
  	if (!arch_pkeys_enabled())
  		return -ENODEV;
- 	ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, &target->thread.amr,
- 				  0, 2 * sizeof(unsigned long));
- 	if (ret)
- 		return ret;
- 	ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, &default_uamor,
- 				  2 * sizeof(unsigned long), 3 * sizeof(unsigned long));
- 	return ret;
 -	return membuf_write(&to, &target->thread.amr, ELF_NPKEY * sizeof(unsigned long));
++	membuf_write(&to, &target->thread.amr, 2 * sizeof(unsigned long));
++	return membuf_write(&to, &default_uamor, sizeof(unsigned long));
  static int pkey_set(struct task_struct *target, const struct user_regset *regset,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2020-07-27  1:32 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-27  1:32 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-05-01  2:06 linux-next: manual merge of the vfs tree with the powerpc tree Stephen Rothwell
2013-05-01  5:01 ` Vasant Hegde
2013-05-01  5:10   ` Al Viro
2013-04-29  1:35 Stephen Rothwell
2013-04-29  3:40 ` Benjamin Herrenschmidt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).