Subject: Re: linux-next: manual merge of the ide tree

From: Bartlomiej Zolnierkiewicz <[email-masked]>
Date: Thu, 17 Jul 2008 17:30:04 +0200

Hi,

On Thursday 17 July 2008, Stephen Rothwell wrote:
> Hi Bart,
> 
> On Wed, 16 Jul 2008 15:05:28 +1000 Stephen Rothwell <[email-masked]> 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