Re: git rebase: unexpected conflict

"Michael S. Tsirkin" [off-list ref] writes:

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
--------------------------

Sure enough, there are conflicts in drivers/mtd/nand/Kconfig:

<<<<<<< HEAD:drivers/mtd/nand/Kconfig
config MTD_NAND_CAFE
       tristate "NAND support for OLPC CAFÉ chip"
       depends on PCI
       help
         Use NAND flash attached to the CAFÉ chip designed for the $100
         laptop.
=======
config MTD_NAND_AT91
        bool "Support for NAND Flash / SmartMedia on AT91"
        depends on MTD_NAND && ARCH_AT91
        help
          Enables support for NAND Flash / Smart Media Card interface
          on Atmel AT91 processors.

quoted

quoted

quoted

quoted

quoted

quoted

quoted

[MTD] NAND: AT91 NAND driver:drivers/mtd/nand/Kconfig

But I don't really understand where do the conflicts come from:
The patch I skipped (9b3bfe5696aa417d38ce903eb345a03d65743dd2)
only touched the file drivers/infiniband/core/addr.c,
so why can't rebase replay all of the changes?

That is because David Woodhouse has an evil merge at
c45aa055c32b488fc3fd73c760df372b09acf69a.

Running "git show" on that commit would tell you the story.