All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the ide tree
Date: Thu, 17 Jul 2008 17:30:04 +0200	[thread overview]
Message-ID: <200807171730.04634.bzolnier@gmail.com> (raw)
In-Reply-To: <20080717134055.1d087d83.sfr@canb.auug.org.au>


Hi,

On Thursday 17 July 2008, Stephen Rothwell wrote:
> Hi Bart,
> 
> On Wed, 16 Jul 2008 15:05:28 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the ide tree got a conflict in lots of files
> > because all of the changes that have been merged into Linus' tree are
> > common, but followed by further changes in the ide tree to the same
> > regions of some files.
> 
> Same thing today.  I used the ide tree's version of the files.

No wonder about that since there were another push to Linus
(you were on cc: as usual). ;-)

IIRC previously this shouldn't have been a problem, did something
change (i.e. BASE tag) in linux-next w.r.t. handling quilt trees?

Thanks,
Bart

  reply	other threads:[~2008-07-17 15:32 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-16  5:05 linux-next: manual merge of the ide tree Stephen Rothwell
2008-07-17  3:40 ` Stephen Rothwell
2008-07-17 15:30   ` Bartlomiej Zolnierkiewicz [this message]
2008-07-18  0:42     ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2008-08-06  3:35 Stephen Rothwell
2008-07-23  4:06 Stephen Rothwell
2008-07-09  2:47 Stephen Rothwell
2008-07-09  2:45 Stephen Rothwell
2008-07-07 10:49 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=200807171730.04634.bzolnier@gmail.com \
    --to=bzolnier@gmail.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.