On 12/10/2014 04:53 AM, Michael Ellerman wrote: > Hi Corey, > > On Tue, 2014-12-09 at 11:59 -0600, Corey Minyard wrote: >> Jeremy Kerr (2): >> powerpc/powernv: Add OPAL IPMI interface >> drivers/char/ipmi: Add powernv IPMI driver > I created a topic branch for that powerpc patch, but it looks like you didn't > merge it?
No, I missed that. I've never had to do any serious merging with other changes, so I've never had to do this before. I can fix it if Linus wants to wait. Thanks for the heads up. -corey > > > https://git.kernel.org/cgit/linux/kernel/git/mpe/linux.git/log/?h=topic/opal-ipmi > > The merge conflict between your tree and mine is not all that pretty, though > Linus should be able to work it out. I haven't sent my pull request yet > though, > so he'll probably get it when he merges my tree. > > The patch in your tree does look correct, so that's OK, but maybe next time we > can both merge the topic branch. > > cheers > > ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk _______________________________________________ Openipmi-developer mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openipmi-developer
