On 04.11.2013, at 01:03, Scott Wood <scottwood@xxxxxxxxxxxxx> wrote: > On Mon, 2013-11-04 at 07:56 +1100, Benjamin Herrenschmidt wrote: >> On Sun, 2013-11-03 at 16:30 +0200, Gleb Natapov wrote: >>> On Thu, Oct 31, 2013 at 10:18:19PM +0100, Alexander Graf wrote: >>>> From: Bharat Bhushan <r65777@xxxxxxxxxxxxx> >>>> >>>> This way we can use same data type struct with KVM and >>>> also help in using other debug related function. >>>> >>>> Signed-off-by: Bharat Bhushan <bharat.bhushan@xxxxxxxxxxxxx> >>>> Signed-off-by: Alexander Graf <agraf@xxxxxxx> >>> It would be nice to have PPC maintainers (CCed) ACKs here. This patch >>> also has merging conflicts with cbc9565e (should be easy to resolve) >> >> Is it easier if I put it in powerpc -next and resolve the conflicts ? >> >> I was ok with the patch but yes, I should probably have put it in a >> topic branch in the first place and merge it both in my tree and Alex. > > It's already in your -next via my tree (sha1 > 51ae8d4a2b9e4aa9a502061b9c39168e08829b94). I didn't realize Alex was > planning on applying it. Yeah, it's what Ben and me agreed on after I waited forever to get a topic branch created. Oh well, I guess this time we just have to manually resolve the conflicts and do a better job at communicating next time. Alex -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
