* Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > On Wed, Oct 20, 2010 at 6:48 AM, Ingo Molnar <mingo@xxxxxxx> wrote: > > > > I re-created the merge commit the following way: > > > > git checkout c2f4398 # has old drivers/acpi/pci_irq.c > > git merge 662c319 # contains new drivers/acpi/pci_irq.c bits > > The other way around. The c2f4398 version is the new one, the 662c319 is the old > one. So git picks the new one. Ah, indeed - i got confused by the fact that the newer tree had the 'older' content of drivers/acpi/pci_irq.c. (which was really a new version as you noted) Found the right commit as well - that chunk got zapped by: | | commit ec9f168fcc344d2ffec1c8c822076bf22dab5c33 | Merge: b2576e1 087da3b | Author: Len Brown <len.brown@xxxxxxxxx> | Date: Fri Jan 9 03:41:08 2009 -0500 | | Merge branch 'simplify_PRT' into release | | Conflicts: | drivers/acpi/pci_irq.c | | Note that this merge disables | e1d3a90846b40ad3160bf4b648d36c6badad39ac | pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalent | | Signed-off-by: Len Brown <len.brown@xxxxxxxxx> | And was marked thusly by Len. So everything is in order - this chunk fell victim to non-trivial merge complications and needs a resurrection. Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
