On Fri, Mar 23, 2012 at 2:10 PM, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > On Fri, Mar 23, 2012 at 12:58 PM, Yinghai Lu <yinghai@xxxxxxxxxx> wrote: >> >> There are some merge conflicts. Hope attached patch could help Linus a >> little bit. > > Hmm. My merge does not agree with yours at all in the MIPS > pcibios_fixup_bus() area. > > Your patch re-introduces the device resource fixup that Bjorn removed, > for example. > > I think my merge is correct, but hey, people should double-check. yes, you are right. Yinghai
