On Wed, 31 Oct 2012, Kent Yoder wrote: > > > 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?
Nope, my 'master' tracks Linus. Use the -next branch. See http://kernsec.org/wiki/index.php/Kernel_Repository -- James Morris <jmor...@namei.org> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
