On Thu, Nov 01, 2012 at 02:56:14AM +1100, James Morris wrote: > On Tue, 30 Oct 2012, Kent Yoder wrote: > > > Hi James, > > > > Please pull as an update for 3.7. > > > > Thanks, > > Kent > > > > The following changes since commit 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64: > > > > Linux 3.7-rc3 (2012-10-28 12:24:48 -0700) > > > > are available in the git repository at: > > > > git://github.com/shpedoikal/linux.git tpmdd-v3.7-rc3 > > I get massive merge conflicts pulling this into my -next branch.
I applied it to your master, I was hoping this could get in before 3.7 is released. Is this the right way to go about this? Kent > > > > -- > James Morris > <[email protected]> > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
