Re: linux-next: manual merge of the driver-core tree with thedriver-core.current tree

From: Greg KH
Date: Wed Jun 19 2013 - 23:27:40 EST


On Thu, Jun 20, 2013 at 09:22:13AM +0800, Ming Lei wrote:
> Hi Stephen,
>
> Thanks for your help.
>
> On Thu, Jun 20, 2013 at 9:06 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> >
> > Try "git diff-tree --cc e4b00d75ee3ed3af9fac83970d21e27d1ad4aa8d"
>
> Greg, Stephen, so is sort of below generated patch what you expected?
>
> If yes, I will send it out to you.

Thanks, that helped out a lot. I've now merged this together, and
pushed it out to my driver-core-next branch, can you verify that I got
it all correct?

thanks,

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