From: Rusty Russell <rusty@rustcorp.com.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andi Kleen <ak@linux.intel.com>,
Andrew Morton <akpm@linux-foundation.org>,
David Howells <dhowells@redhat.com>
Subject: Re: linux-next: manual merge of the modules tree with Linus' tree
Date: Mon, 08 Oct 2012 13:11:18 +1030 [thread overview]
Message-ID: <87vcelptwx.fsf@rustcorp.com.au> (raw)
In-Reply-To: <20121008114904.8c920933bfdf81a8e0c70647@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Rusty,
>
> Today's linux-next merge of the modules tree got a conflict in
> init/Kconfig between commit 754b7b63d112 ("sections: disable const
> sections for PA-RISC v2") from Linus' tree and commit 54ddd23d78ba
> ("X.509: Add simple ASN.1 grammar compiler") from the modules tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> BTW, Rusty, that commit from the modules tree has no SOB from you even
> though you committed it.
Well, I merged that whole branch actually.
>From now on I'll be cherry-picking instead (mainly because I want to
fold in fixes anyway, and that's a bit messy).
Cheers,
Rusty.
next prev parent reply other threads:[~2012-10-08 5:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-08 0:49 linux-next: manual merge of the modules tree with Linus' tree Stephen Rothwell
2012-10-08 2:41 ` Rusty Russell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-26 22:53 Stephen Rothwell
2013-12-19 2:51 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-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=87vcelptwx.fsf@rustcorp.com.au \
--to=rusty@rustcorp.com.au \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).