archive mirror
 help / color / mirror / Atom feed
From: Nick Andrew <>
To: Stephen Rothwell <>
Cc: Jesper Juhl <>,, Arthur Jones <>
Subject: Re: linux-next: manual merge of the trivial tree
Date: Mon, 28 Jul 2008 19:41:10 +1000	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

Hi all,

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.

PGP Key ID = 0x418487E7            
PGP Key fingerprint = B3ED 6894 8E49 1770 C24A  67E3 6266 6EB9 4184 87E7

  reply	other threads:[~2008-07-28  9:41 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 [this message]
2008-08-27  5:19   ` Stephen Rothwell
  -- 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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \

* 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).