From: Richard Weinberger <richard@nod.at>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: user-mode-linux-devel@lists.sourceforge.net,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] um: Cleanup headers files
Date: Sun, 12 Feb 2012 22:26:06 +0100 [thread overview]
Message-ID: <4F382E6E.4060201@nod.at> (raw)
In-Reply-To: <20120212212003.GU23916@ZenIV.linux.org.uk>
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
next prev parent reply other threads:[~2012-02-12 21:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-25 17:23 [PATCH 1/2] um: Use generic io.h Richard Weinberger
2012-01-25 17:23 ` [PATCH 2/2] um: Serve io_remap_pfn_range() Richard Weinberger
2012-01-30 18:23 ` [PATCH 1/2] um: Use generic io.h Al Viro
2012-01-30 19:10 ` Richard Weinberger
2012-01-30 19:25 ` Al Viro
2012-01-30 19:32 ` Al Viro
2012-01-30 19:57 ` Richard Weinberger
2012-02-03 23:17 ` [PATCH] um: Cleanup headers files Richard Weinberger
2012-02-04 0:14 ` Al Viro
2012-02-04 0:26 ` Richard Weinberger
2012-02-04 0:44 ` Richard Weinberger
2012-02-12 20:27 ` Al Viro
2012-02-12 21:01 ` Richard Weinberger
2012-02-12 21:20 ` Al Viro
2012-02-12 21:26 ` Richard Weinberger [this message]
2012-02-12 21:28 ` Al Viro
2012-02-04 14:05 ` Richard Weinberger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F382E6E.4060201@nod.at \
--to=richard@nod.at \
--cc=linux-kernel@vger.kernel.org \
--cc=user-mode-linux-devel@lists.sourceforge.net \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).