linux-next: manual merge of the ide tree

linux-next: manual merge of the ide tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 944 bytes --]

Hi Bart,

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.

I just took the ide tree versions of the files except for
drivers/ide/ide-tape.c which had some further changes from commit
04f4ac9d1bb8a9103609ce8e927f8e98826ce339 ("ide-tape: cdev lock_kernel()
pushdown") from Linus' tree and commit
463ddc2102da76e76bfd1efc721cc5ff9b81cc54 ("device create: ide: convert
device_create to device_create_drvdata") from the driver-core tree.  You
might consider adding those changes to your tree (or in the former case
just rebasing on top of Linus' tree).  The rebase will, of course,
eliminate the conflicts in all the other files as well.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 519 bytes --]

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.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

[Bartlomiej Zolnierkiewicz]

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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 666 bytes --]

Hi Bart,

On Thu, 17 Jul 2008 17:30:04 +0200 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> wrote:
>
> No wonder about that since there were another push to Linus
> (you were on cc: as usual). ;-)

Yep, I am not complaining, just noting.

> 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?

This causes conflicts not because the same patches appear in both trees,
but because the ide tree then goes on to further modify conflicting
sections of those files.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ide tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 609 bytes --]

Hi Bart,

Today's linux-next merge of the ide tree got conflicts in
drivers/ide/ide-iops.c and drivers/ide/ide-dma.c between commits
367fdcb4e401161e51aaee5d06b3f82098bafefc ("ide: fix pre-EIDE SWDMA
support on big-endian") and 242f44261e6c5fdc13e3cd12f949ab717dc37d58
("ide: fix ide_fix_driveid()") from Linus' tree (which are also in the
ide tree) and further changes in the ide tree.

This is just to let you know, there is not problem here.

I just used the versions from the ide tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ide tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

Hi Bart,

Today's linux-next merge of the ide tree got conflicts in
include/asm-sparc/ide_32.h and include/asm-sparc/ide_64.h between commit
6662327e190a20bd42867f11abca095badee56e1 ("ide: merge
<asm-sparc/ide_64.h> with <asm-sparc/ide_32.h>") from the sparc-current
tree and commit 41a69a4b23f34977d11aacf1d56614f1c983d856 ("ide: define
MAX_HWIFS in <linux/ide.h>") from the ide tree.

I removed the appropriate lines from the merged file.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ide tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 533 bytes --]

Hi Bart,

Today's linux-next merge of the ide tree got a conflict in
drivers/ide/pci/it8213.c between commit
be305042b7a01a1ab03a8adfa95f57bc63e012e1 ("it8213: fix return value in
it8213_init_one()") from Linus' tree (which is also in the ide tree) and
commit 0524d020934e71bad3b9ea60e1c98ab7725c8aad ("ide: add ->dev and
->host_priv fields to struct ide_host") from the ide tree.

I just used the ide tree version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ide tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 441 bytes --]

Hi Bart,

Today's linux-next merge of the ide tree got a conflict in
drivers/ide/arm/palm_bk3710.c between commit
ffab6cf44e9058fe75a33aa86386b22e616a8f6f ("palm_bk3710: fix IDECLK period
calculation") from Linus' tree (which is also in the ide tree) and
various commits from the ide tree.

I just used the ide tree version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the ide tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 634 bytes --]

Hi Bart,

Today's linux-next merge of the ide tree got a conflict in
drivers/ide/ide.c between commits
2b54ed9467697b0ce2d60d89e5e4253c9e322c26 ("ide: ide_unregister() locking
bugfix"), bd8a59e29726b2a5ff7baefe995febdc63044a61 ("ide: ide_unregister
() warm-plug bugfix") and 7cd95f56cb61f5348d062527c9d3653196f6e629 ("ide:
fix hwif->gendev refcounting") from Linus' tree (which all exist in the
ide tree as well) and bits from the ide tree (since it does more work in
the same areas).

I took the ide tree version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]