Re: [GIT PATCH] STAGING patches for 3.1

[Greg KH]

On Mon, Jul 25, 2011 at 11:31:48PM -0700, Linus Torvalds wrote:
> On Mon, Jul 25, 2011 at 10:15 PM, Greg KH <greg@xxxxxxxxx> wrote:
> >
> > Note, I have not successfully merged this with your tree yet, the
> > diffstat below is against the 3.0-rc6 tree.  When merging with your
> > tree, there are a number of merge issues that I trust you can resolve
> > easier than I can.  If you have problems, please let me know and I will
> > fix them up on Wednesday when I get done driving to my next hotel
> > location.
> 
> No problem, some of the merge conflicts looked a bit ugly, but they
> were all trivial. Most of them was due to some trivial removed or
> added #include lines, and it just then clashed with your much bigger
> changes. Easy enough to sort out, and in couple of cases the bigger
> changes had just made the small changes irrelevant too.
> 
> So all merged and pushed out. Of course, maybe I made a mistake
> somewhere, but none of it looked at all questionable (famous last
> words ;)

Great, thanks for doing this, much appreciated.

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/