mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Joe Perches <joe@perches.com>
Subject: Re: linux-next: manual merge of the vfs tree with the v9fs tree
Date: Sat, 7 Jan 2012 17:44:34 +1100	[thread overview]
Message-ID: <20120107174434.ed579c80d0371c0b81135aeb@canb.auug.org.au> (raw)
In-Reply-To: <CAFkjPTndww2mu16gCa9cn7V=0t0wvYgPQ1wQGz0q0B=Fk6xQbA@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 967 bytes --]

Hi Eric,

On Fri, 6 Jan 2012 22:38:57 -0600 Eric Van Hensbergen <ericvh@gmail.com> wrote:
>
> What's typically the right process for me to prep the merge for Linus?
> Should I pull Al's patchset and then apply mine on top of it so I can
> merge your merge fix or just have my for-linus tree based on his
> current working merge (which I assume has Al's by now).  Just a bit
> confused because rebasing was discouraged last merge window -- but not
> sure how to deal with the conflict without a rebase....

Just warn Linus that there will be a conflict with Al's stuff.  You could
supply him with the patch I gave you just for good measure, but he is
good (better then me) at fixing merge conflicts and will ping you if he
has doubts.

i.e. don't rebase or even bother doing the merge yourself.  Just ask him
to pull what was in linux-next.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

  reply	other threads:[~2012-01-07  6:44 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-06  2:46 Stephen Rothwell
2012-01-07  4:38 ` Eric Van Hensbergen
2012-01-07  6:44   ` Stephen Rothwell [this message]
2013-10-29  2:46 Stephen Rothwell
2015-04-07  4:05 Stephen Rothwell
2022-07-13  0:37 Stephen Rothwell

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=20120107174434.ed579c80d0371c0b81135aeb@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=ericvh@gmail.com \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --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

all inboxes | Powered by JetHome®