From: Linus Torvalds <torvalds@linux-foundation.org>
To: "Jörn Engel" <joern@logfs.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: Please pull logfs tree
Date: Sat, 6 Mar 2010 13:26:46 -0800 (PST) [thread overview]
Message-ID: <alpine.LFD.2.00.1003061319530.31447@localhost.localdomain> (raw)
In-Reply-To: <20100306210459.GA21570@logfs.org>
On Sat, 6 Mar 2010, Jörn Engel wrote:
>
> 1) pull git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs.git
> and apply the patch at the bottom yourself.
Not quite - it needs to be applied while merging, rather than applied
separately. It's a conflict, even though it's not a data-conflict, but a
semantic one.
But that's trivial enough. "git pull --no-commit" + fixup + "git commit"
is trivially done, now that I was fore-warned. Thanks.
> 2) pull git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs_for_2.6.34
> A tree with the patch applied that won't work standalone but will work
> after being pulled into your tree (tested locally).
No, that's horrible. Unbisectable. Not that anybody probably cares in this
case, but it's fundamentally wrong to merge something that doesn't work
before the merge.
> 3) pull git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs_for_2.6.34_alternative
> A tree that merged your tree and the logfs tree, then has the patch
> applied. Works standalone but has an additional merge commit.
That's ok, but I already did the trivial merge, which actually had another
conflict too (which showed up as a real data conflict on the Kconfig
file).
Linus
next prev parent reply other threads:[~2010-03-06 21:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-06 21:04 Please pull logfs tree Jörn Engel
2010-03-06 21:26 ` Linus Torvalds [this message]
2010-03-06 21:35 ` Jörn Engel
2010-03-06 22:04 ` Linus Torvalds
2010-03-30 7:22 ` Please pull logfs tree for fixes Jörn Engel
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=alpine.LFD.2.00.1003061319530.31447@localhost.localdomain \
--to=torvalds@linux-foundation.org \
--cc=joern@logfs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.