linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Russell King <linux@armlinux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Arnd Bergmann <arnd@arndb.de>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	"Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>,
	Vasily Averin <vvs@virtuozzo.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the arm tree
Date: Mon, 6 Sep 2021 14:46:17 +1000	[thread overview]
Message-ID: <20210906144617.20cd87c0@canb.auug.org.au> (raw)
In-Reply-To: <20210824191039.10d869cb@canb.auug.org.au>

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

Hi all,

On Tue, 24 Aug 2021 19:10:39 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   ipc/sem.c
> 
> between commit:
> 
>   bdec0145286f ("ARM: 9114/1: oabi-compat: rework sys_semtimedop emulation")
> 
> from the arm tree and commit:
> 
>   7a4207f02a96 ("memcg: enable accounting of ipc resources")
> 
> from the akpm-current tree.
> 
> I fixed it up (I think, 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.
> 
> diff --cc ipc/sem.c
> index ae8d9104b0a0,1a8b9f0ac047..000000000000
> --- a/ipc/sem.c
> +++ b/ipc/sem.c
> @@@ -2216,40 -2229,9 +2216,40 @@@ long __do_semtimedop(int semid, struct 
>   
>   	unlink_queue(sma, &queue);
>   
>  -out_unlock_free:
>  +out_unlock:
>   	sem_unlock(sma, locknum);
>   	rcu_read_unlock();
>  +out:
>  +	return error;
>  +}
>  +
>  +static long do_semtimedop(int semid, struct sembuf __user *tsops,
>  +		unsigned nsops, const struct timespec64 *timeout)
>  +{
>  +	struct sembuf fast_sops[SEMOPM_FAST];
>  +	struct sembuf *sops = fast_sops;
>  +	struct ipc_namespace *ns;
>  +	int ret;
>  +
>  +	ns = current->nsproxy->ipc_ns;
>  +	if (nsops > ns->sc_semopm)
>  +		return -E2BIG;
>  +	if (nsops < 1)
>  +		return -EINVAL;
>  +
>  +	if (nsops > SEMOPM_FAST) {
> - 		sops = kvmalloc_array(nsops, sizeof(*sops), GFP_KERNEL);
> ++		sops = kvmalloc_array(nsops, sizeof(*sops), GFP_KERNEL_ACCOUNT);
>  +		if (sops == NULL)
>  +			return -ENOMEM;
>  +	}
>  +
>  +	if (copy_from_user(sops, tsops, nsops * sizeof(*tsops))) {
>  +		ret =  -EFAULT;
>  +		goto out_free;
>  +	}
>  +
>  +	ret = __do_semtimedop(semid, sops, nsops, timeout, ns);
>  +
>   out_free:
>   	if (sops != fast_sops)
>   		kvfree(sops);

This is now a conflict between the arm tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

  reply	other threads:[~2021-09-06  4:46 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-24  9:10 linux-next: manual merge of the akpm-current tree with the arm tree Stephen Rothwell
2021-09-06  4:46 ` Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-07-15  8:38 Stephen Rothwell
2015-12-07  8:00 Stephen Rothwell
2015-07-16  4:50 Stephen Rothwell
2014-06-02  8:42 Stephen Rothwell
2014-04-24  5:25 Stephen Rothwell
2014-04-24 14:27 ` Mark Salter

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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

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

  git send-email \
    --in-reply-to=20210906144617.20cd87c0@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=rmk+kernel@armlinux.org.uk \
    --cc=vvs@virtuozzo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* 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).