From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <christian@brauner.io>
Cc: Christian Brauner <christian.brauner@ubuntu.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mimi Zohar <zohar@linux.ibm.com>,
Tushar Sugandhi <tusharsu@linux.microsoft.com>
Subject: linux-next: manual merge of the pidfd tree with the integrity tree
Date: Mon, 25 Jan 2021 17:31:20 +1100 [thread overview]
Message-ID: <20210125173120.28b94105@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 782 bytes --]
Hi all,
FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.
Today's linux-next merge of the pidfd tree got a conflict in:
security/integrity/ima/ima_main.c
between commits:
2b4a2474a202 ("IMA: generalize keyring specific measurement constructs")
291af651b350 ("IMA: add support to measure buffer data hash")
d6e645012d97 ("IMA: define a hook to measure kernel integrity critical data")
9f5d7d23cc5e ("IMA: extend critical data hook to limit the measurement based on a label")
from the integrity tree and commit:
a2d2329e30e2 ("ima: handle idmapped mounts")
from the pidfd tree.
At this point, the whole thing just got too hard, so I dropped the
pidfd tree for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-01-25 6:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 6:31 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-25 6:18 linux-next: manual merge of the pidfd tree with the integrity tree Stephen Rothwell
2021-02-14 21:07 ` Stephen Rothwell
2021-02-23 0:00 ` 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=20210125173120.28b94105@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=christian.brauner@ubuntu.com \
--cc=christian@brauner.io \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tusharsu@linux.microsoft.com \
--cc=zohar@linux.ibm.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).