From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Michal Hocko <mhocko@suse•com>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Paul Moore <paul@paul-moore•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the security tree with the mm tree
Date: Tue, 17 Sep 2024 18:02:07 +1000 [thread overview]
Message-ID: <20240917180207.1f68637c@canb.auug.org.au> (raw)
In-Reply-To: <Zuk06cfmaOT5fltF@tiehlicka>
[-- Attachment #1: Type: text/plain, Size: 2121 bytes --]
Hi Michal,
On Tue, 17 Sep 2024 09:51:05 +0200 Michal Hocko <mhocko@suse•com> wrote:
>
> On Tue 17-09-24 09:30:48, Stephen Rothwell wrote:
> >
> > On Wed, 11 Sep 2024 14:28:22 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> > >
> > > Today's linux-next merge of the security tree got conflicts in:
> > >
> > > include/linux/lsm_hooks.h
> > > security/security.c
> > >
> > > between commit:
> > >
> > > 3346ada04cf5 ("bcachefs: do not use PF_MEMALLOC_NORECLAIM")
> > >
> > > from the mm-unstable branch of the mm tree and commit:
> > >
> > > 711f5c5ce6c2 ("lsm: cleanup lsm_hooks.h")
> > >
> > > from the security tree.
> > >
> > > I fixed it up (I used the latter version ofinclude/linux/lsm_hooks.h
> > > and 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.
> > >
> > > --
> > > Cheers,
> > > Stephen Rothwell
> > >
> > > diff --cc security/security.c
> > > index 3581262da5ee,4564a0a1e4ef..000000000000
> > > --- a/security/security.c
> > > +++ b/security/security.c
> > > @@@ -660,7 -745,7 +745,7 @@@ static int lsm_file_alloc(struct file *
> > > *
> > > * Returns 0, or -ENOMEM if memory can't be allocated.
> > > */
> > > - int lsm_inode_alloc(struct inode *inode, gfp_t gfp)
> > > -static int lsm_inode_alloc(struct inode *inode)
> > > ++static int lsm_inode_alloc(struct inode *inode, gfp_t gfp)
> > > {
> > > if (!lsm_inode_cache) {
> > > inode->i_security = NULL;
> >
> > This is now a conflict between the mm tree and Linus' tree.
>
> Andrew said he would drop the mm patches and I will resubmit when merge
> window closes.
Yeah, I normally drop the unstable parts of the mm tree during the merge
window, so I will do that from tomorrow.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-09-17 8:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-11 4:28 linux-next: manual merge of the security tree with the mm tree Stephen Rothwell
2024-09-11 20:09 ` Paul Moore
2024-09-16 23:30 ` Stephen Rothwell
2024-09-17 7:51 ` Michal Hocko
2024-09-17 8:02 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-14 3:46 Stephen Rothwell
2024-11-20 3:30 ` Stephen Rothwell
2024-10-23 1:31 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=20240917180207.1f68637c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhocko@suse$(echo .)com \
--cc=paul@paul-moore$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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