diff for duplicates of <1510196818.4484.120.camel@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index d3fb85b..7f900b5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ On Thu, 2017-11-09 at 10:26 +1100, Stephen Rothwell wrote: > > > > > > > > > > > James is staging the subsystem patches independently of each other, in > > > > > > case of a similar problem, so that they can be pulled separately. -> > > > > > There's a new "next-general" branch. +> > > > > > ?There's a new "next-general" branch. > > > > > > > > > > If you send me a pull request, I'm combining branches into next-testing, > > > > > too, which is pulled into -next. @@ -26,7 +26,7 @@ On Thu, 2017-11-09 at 10:26 +1100, Stephen Rothwell wrote: > > > (git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next) > > > > James' security tree is based on -rc3, while the integrity tree is -> > based on -rc4. The rebased integrity patches are now in my security- +> > based on -rc4. ?The rebased integrity patches are now in my security- > > next-integrity branch. > > So since those patches are now in James tree, you should drop them from @@ -36,3 +36,8 @@ Ok, I had been planning on sending an independent pull request to Linus, as requested. Mimi + +-- +To unsubscribe from this list: send the line "unsubscribe linux-security-module" in +the body of a message to majordomo at vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 1e52423..01e7e92 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,15 +8,10 @@ "ref\020171109075334.1809f4cc@canb.auug.org.au\0" "ref\01510175047.4484.35.camel@linux.vnet.ibm.com\0" "ref\020171109102635.7691281d@canb.auug.org.au\0" - "From\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" - "Subject\0Re: [RFC PATCH] ima: require secure_boot rules in lockdown mode\0" + "From\0zohar@linux.vnet.ibm.com (Mimi Zohar)\0" + "Subject\0[RFC PATCH] ima: require secure_boot rules in lockdown mode\0" "Date\0Wed, 08 Nov 2017 22:06:58 -0500\0" - "To\0Stephen Rothwell <sfr@canb.auug.org.au>\0" - "Cc\0James Morris <james.l.morris@oracle.com>" - David Howells <dhowells@redhat.com> - linux-integrity <linux-integrity@vger.kernel.org> - Matthew Garrett <mjg59@google.com> - " linux-security-module <linux-security-module@vger.kernel.org>\0" + "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" "On Thu, 2017-11-09 at 10:26 +1100, Stephen Rothwell wrote:\n" @@ -35,7 +30,7 @@ "> > > > > \n" "> > > > > > James is staging the subsystem patches independently of each other, in\n" "> > > > > > case of a similar problem, so that they can be pulled separately.\n" - "> > > > > > There's a new \"next-general\" branch. \n" + "> > > > > > ?There's a new \"next-general\" branch. \n" "> > > > > \n" "> > > > > If you send me a pull request, I'm combining branches into next-testing, \n" "> > > > > too, which is pulled into -next. \n" @@ -47,7 +42,7 @@ "> > > (git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next) \n" "> > \n" "> > James' security tree is based on -rc3, while the integrity tree is\n" - "> > based on -rc4. The rebased integrity patches are now in my security-\n" + "> > based on -rc4. ?The rebased integrity patches are now in my security-\n" "> > next-integrity branch.\n" "> \n" "> So since those patches are now in James tree, you should drop them from\n" @@ -56,6 +51,11 @@ "Ok, I had been planning on sending an independent pull request to\n" "Linus, as requested.\n" "\n" - Mimi + "Mimi\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-security-module\" in\n" + "the body of a message to majordomo at vger.kernel.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -deb6248960c59f98b57774d7d0d220205f0100cc6abb516f7ddf5f7222b17fc1 +4288e4cc0284a8817c9d48d4231bff604d25416eabb154a6ddf8a2599e3d7bdd
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.