From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Moore <paul@paul-moore.com>
Cc: John Johansen <john.johansen@canonical.com>,
Casey Schaufler <casey@schaufler-ca.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
linux-security-module@vger.kernel.org
Subject: Re: linux-next: manual merge of the apparmor tree with the security tree
Date: Mon, 6 Nov 2023 11:28:46 +1100 [thread overview]
Message-ID: <20231106112846.4c2a5c64@canb.auug.org.au> (raw)
In-Reply-To: <CAHC9VhQkUVCAboT78M3g6LabmzFqKYdsxMHQ7ePETJKnzDiV+Q@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 401 bytes --]
Hi Paul,
On Sun, 5 Nov 2023 18:36:49 -0500 Paul Moore <paul@paul-moore.com> wrote:
>
> The LSM, SELinux, and audit dev-staging branches will no longer flow
> into the next branches, and I've reset the current lsm/next branch so
> this should not be an issue the next time you pull.
Thanks for that. It can all come back after the merge window, of course.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-11-06 0:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-27 2:03 linux-next: manual merge of the apparmor tree with the security tree Stephen Rothwell
2023-10-28 15:32 ` Paul Moore
2023-10-29 21:09 ` John Johansen
2023-10-30 16:52 ` Paul Moore
2023-10-30 20:46 ` Stephen Rothwell
2023-10-30 21:04 ` Paul Moore
2023-11-05 23:14 ` Stephen Rothwell
2023-11-05 23:36 ` Paul Moore
2023-11-06 0:28 ` Stephen Rothwell [this message]
2023-11-05 23:09 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-11-21 3:26 Stephen Rothwell
2022-11-21 18:51 ` Paul Moore
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=20231106112846.4c2a5c64@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=casey@schaufler-ca.com \
--cc=john.johansen@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-security-module@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox