From: Stephen Rothwell <sfr@canb•auug.org.au>
To: James Morris <jmorris@namei•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Toshiyuki Okajima <toshi.okajima@jp•fujitsu.com>,
David Howells <dhowells@redhat•com>,
"Justin P. Mattock" <justinmattock@gmail•com>
Subject: linux-next: manual merge of the security-testing tree with Linus' tree
Date: Thu, 6 May 2010 12:30:49 +1000 [thread overview]
Message-ID: <20100506123049.082e98cc.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 536 bytes --]
Hi James,
Today's linux-next merge of the security-testing tree got a conflict in
security/keys/keyring.c between commit
cea7daa3589d6b550546a8c8963599f7c1a3ae5c ("KEYS: find_keyring_by_name()
can gain access to a freed keyring") from Linus' tree and commit
c5b60b5e67af8be4c58d3ffcc36894f69c4fbdc1 ("security: whitespace coding
style fixes") from the security-testing tree.
I just used the version from Linus' tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-05-06 2:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-06 2:30 Stephen Rothwell [this message]
2010-05-06 10:49 ` linux-next: manual merge of the security-testing tree with Linus' tree David Howells
2010-05-06 23:10 ` James Morris
2010-05-06 23:24 ` Justin P. Mattock
-- strict thread matches above, loose matches on Subject: below --
2011-05-16 3:02 Stephen Rothwell
2011-05-16 14:13 ` Serge Hallyn
2011-05-16 14:52 ` Stephen Rothwell
2009-05-22 5:29 Stephen Rothwell
2009-05-22 5:35 ` Al Viro
2009-05-22 9:04 ` James Morris
2009-02-06 7:23 Stephen Rothwell
2009-02-06 8:12 ` James Morris
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=20100506123049.082e98cc.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=jmorris@namei$(echo .)org \
--cc=justinmattock@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=toshi.okajima@jp$(echo .)fujitsu.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