On Tue, Mar 31, 2015 at 05:02:14PM +0200, Joerg Roedel wrote: > Hi Thierry, > > On Fri, Mar 27, 2015 at 11:15:41AM +0100, Thierry Reding wrote: > > Another possibility would be for you to ack this patch so that I can > > take it into the same branch as the dependency. The remainder of this > > series doesn't depend on either of the two patches, so they should be > > fine for you to take into your tree. > > This solution sounds like the best one. You have my > > Acked-by: Joerg Roedel <jroedel@xxxxxxx> > > on the first patch. Thanks. > I merged patches 2-4 into the arm/tegra branch. As > you noticed there were conflict merging the branch into next. Please > have a look into my solution for that when I pushed it out later today > and let me know if it looks good and still works. Yes, the resolution looks correct and I've been running linux-next without issues for a couple of days now. Thanks, Thierry
Attachment:
pgpzk03yEagz1.pgp
Description: PGP signature