From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Nick Andrew <nick@nick-andrew.net>
Cc: Jesper Juhl <jesper.juhl@gmail.com>,
linux-next@vger.kernel.org, Arthur Jones <ajones@riverbed.com>
Subject: Re: linux-next: manual merge of the trivial tree
Date: Wed, 27 Aug 2008 15:19:57 +1000 [thread overview]
Message-ID: <20080827151957.341e79fa.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20080728094110.GA6278@mail.local.tull.net>
[-- Attachment #1: Type: text/plain, Size: 1121 bytes --]
Hi Nick, Jesper,
On Mon, 28 Jul 2008 19:41:10 +1000 Nick Andrew <nick@nick-andrew.net> wrote:
>
> On Mon, Jul 28, 2008 at 01:37:07PM +1000, Stephen Rothwell wrote:
> > Today's linux-next merge of the trivial tree got a conflict in
> > Documentation/edac.txt between commit
> > 327dafb1c61c9da7b95ac6cc7634a2340cc9509c ("edac: core fix redundant sysfs
> > controls to parameters") from Linus' tree and commit
> > 0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
> > from the trivial tree.
>
> Should we drop the patch or alternately split it into one patch
> per affected file? This must be at least the 3rd time this patch
> has conflicted with other changes.
Can you send all of the trivial tree (that is in -next) to Linus (asking
nicely if he will take it), please? Doing that will require rebasing at
least the above patch (or merging Linus' tree (at least up to the commit
above)) and fixing the conflicts. It has been in its current state since
May 20 ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-08-27 5:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-28 3:37 linux-next: manual merge of the trivial tree Stephen Rothwell
2008-07-28 9:41 ` Nick Andrew
2008-08-27 5:19 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-10-15 14:02 linux-next: Tree for Oct 15 Thierry Reding
2013-10-15 14:02 ` linux-next: manual merge of the trivial tree Thierry Reding
2013-10-16 9:12 ` Jozsef Kadlecsik
2013-10-16 9:20 ` Jiri Kosina
2013-10-16 14:56 ` Pablo Neira Ayuso
2013-10-16 20:10 ` Jozsef Kadlecsik
2008-11-03 3:48 Stephen Rothwell
2008-11-12 17:48 ` Jesper Juhl
2008-07-07 15:39 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=20080827151957.341e79fa.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ajones@riverbed.com \
--cc=jesper.juhl@gmail.com \
--cc=linux-next@vger.kernel.org \
--cc=nick@nick-andrew.net \
/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).