All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Moore <paul@paul-moore.com>
Cc: Gaosheng Cui <cuigaosheng1@huawei.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the security tree with Linus' tree
Date: Mon, 21 Nov 2022 14:20:14 +1100	[thread overview]
Message-ID: <20221121142014.0ae7c8ff@canb.auug.org.au> (raw)

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

Hi all,

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

  security/commoncap.c

between commit:

  8cf0a1bc1287 ("capabilities: fix potential memleak on error path from vfs_getxattr_alloc()")

from Linus' tree and commit:

  f6fbd8cbf3ed ("lsm,fs: fix vfs_getxattr_alloc() return type and caller error paths")

from the security tree.

I fixed it up (I just used the latter) 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.

-- 
Cheers,
Stephen Rothwell

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

             reply	other threads:[~2022-11-21  3:20 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-21  3:20 Stephen Rothwell [this message]
2022-11-21 18:47 ` linux-next: manual merge of the security tree with Linus' tree Paul Moore
2022-11-21 21:55   ` Stephen Rothwell
2022-11-21 23:09     ` Paul Moore
  -- strict thread matches above, loose matches on Subject: below --
2022-09-01  2:27 Stephen Rothwell
2022-09-01 13:56 ` Paul Moore
2019-08-21  3:09 Stephen Rothwell
2019-08-21  3:05 Stephen Rothwell
2019-08-21  3:01 Stephen Rothwell
2019-08-21  3:18 ` Stephen Rothwell
2019-08-12  4:48 Stephen Rothwell
2015-08-04  1:14 Stephen Rothwell
2013-02-04  3:06 Stephen Rothwell
2013-01-21  2:12 Stephen Rothwell
2013-01-21  3:10 ` Mimi Zohar
2013-01-21  4:30   ` Stephen Rothwell
2012-10-17  0:41 Stephen Rothwell
2012-10-17  0:52 ` Stephen Rothwell
2012-10-17  0:41 Stephen Rothwell
2012-10-17  0:41 Stephen Rothwell

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=20221121142014.0ae7c8ff@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=cuigaosheng1@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=paul@paul-moore.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.