On Sun, Feb 12, 2012 at 10:26:06PM +0100, Richard Weinberger wrote: > Am 12.02.2012 22:20, schrieb Al Viro: > >On Sun, Feb 12, 2012 at 10:01:49PM +0100, Richard Weinberger wrote: > >>Am 12.02.2012 21:27, schrieb Al Viro: > >>>>So, I pulled your work and merged it into my shiny new UML tree: > >>>>git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git > >>> > >>>Hmm... I would really, really recommend you to clean the git history in > >>>that > >>>tree up. As it is, you have > >>> * merge of that branch from um-headers > >>> * um: Switch to large mcmodel on x86_64 > >>> * um: Serve io_remap_pfn_range() > >>> * 205 merges from Linus, from mid-April to late January. > >>> * mismerge from Linus on April 14; the diff between the result > >> > >>Okay, I'll create a new tree. This one is definitely screwed. > >>Sorry for the inconvenience. > > > >Just create a new branch in the old one, populate it, verify that the > >tree is what you want it to be, switch to your regular branch, > >git reset --hard<the branch you've just built>, then git push --force > >It's not worse than removal of old tree and replacing it with new one, > >and it's less work... > > It looks like my master branch is screwed. :???\ > Anyway, I'll fix it!
FWIW, #korg in um-headers.git should be about what you had in #master sans that mismerge in intel_pmic_gpio.c and with sane history. Feel free to pick it... ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
