linux-kernel - Re: [GIT PULL] ipmi driver updates

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <548856D7.2070706@mvista.com>
Date:	Wed, 10 Dec 2014 08:21:11 -0600
From:	Corey Minyard <cminyard@...sta.com>
To:	Michael Ellerman <mpe@...erman.id.au>
CC:	Linus Torvalds <torvalds@...ux-foundation.org>,
	linux-kernel <linux-kernel@...r.kernel.org>,
	Tony Rex <tony.rex@...csson.com>,
	Magnus Johansson E <magnus.e.johansson@...csson.com>,
	Per Fogelström <per.fogelstrom@...csson.com>,
	Jeremy Kerr <jk@...abs.org>, Sanjeev <singhsan@...eaurora.org>,
	Thomas Renninger <trenn@...e.de>,
	"openipmi-developer@...ts.sourceforge.net" 
	<openipmi-developer@...ts.sourceforge.net>
Subject: Re: [GIT PULL] ipmi driver updates

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
>
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/