From: u.kleine-koenig@pengutronix.de (Uwe Kleine-König)
To: linux-arm-kernel@lists.infradead.org
Subject: Git pull request: 64-bit atomic user helper
Date: Thu, 30 Jun 2011 14:02:58 +0200 [thread overview]
Message-ID: <20110630120258.GI11559@pengutronix.de> (raw)
In-Reply-To: <20110630100755.GU21898@n2100.arm.linux.org.uk>
Hello,
On Thu, Jun 30, 2011 at 11:07:55AM +0100, Russell King - ARM Linux wrote:
> On Mon, Jun 20, 2011 at 09:54:07PM -0400, Nicolas Pitre wrote:
> > Russell, please pull the following for the next merge window:
> >
> > git://git.linaro.org/people/nico/linux.git cmpxchg64
> >
> As these clash with the entry rework which I have, I'd much prefer
> them to be in patch form rather than git form so I don't have to keep
> remembering to fix the (broken) git rerere merge. git rerere is fine
> if you get it right first time but if not, then it keeps doing it wrong
> each and every time.
git rerere forget <pathspec>
might be what you are looking for.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2011-06-30 12:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-21 1:54 Git pull request: 64-bit atomic user helper Nicolas Pitre
2011-06-21 16:17 ` Dave Martin
2011-06-28 19:59 ` Nicolas Pitre
2011-06-28 20:27 ` Russell King - ARM Linux
2011-06-28 20:41 ` Nicolas Pitre
2011-06-30 10:07 ` Russell King - ARM Linux
2011-06-30 12:02 ` Uwe Kleine-König [this message]
2011-06-30 14:29 ` Nicolas Pitre
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=20110630120258.GI11559@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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).