From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
James Solner <solner@alcatel-lucent.com>,
David Howells <dhowells@redhat.com>
Subject: linux-next: manual merge of the modules tree with Linus' tree
Date: Thu, 19 Dec 2013 13:51:03 +1100 [thread overview]
Message-ID: <20131219135103.a679236c1c4ec0f614fe3357@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 495 bytes --]
Hi Rusty,
Today's linux-next merge of the modules tree got a conflict in Documentation/module-signing.txt between commit 3cafea307642 ("Add Documentation/module-signing.txt file") from the tree and commit 160e01aca3da ("Add Documentation/module-signing.txt file") from the modules tree.
I fixed it up (I arbitrarily chose the version from Linus' tree) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-12-19 2:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-19 2:51 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-26 22:53 linux-next: manual merge of the modules tree with Linus' tree Stephen Rothwell
2012-12-19 0:10 Stephen Rothwell
2012-12-19 5:38 ` Rusty Russell
2012-12-19 21:30 ` Stephen Rothwell
2012-10-08 0:49 Stephen Rothwell
2012-10-08 2:41 ` Rusty Russell
2012-10-04 2:48 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=20131219135103.a679236c1c4ec0f614fe3357@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=solner@alcatel-lucent.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).