lkml.org 
[lkml]   [2012]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] um: Cleanup headers files
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!

Thanks,
//richard
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2012-02-12 22:29    [W:0.054 / U:36.452 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site