lkml.org 
[lkml]   [2014]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [GIT PULL] ipmi driver updates
From
Date
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?

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




\
 
 \ /
  Last update: 2014-12-10 12:21    [W:0.104 / U:1.720 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site