All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dan Williams <dan.j.williams@gmail.com>
To: James Bottomley <James.Bottomley@hansenpartnership.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next@vger.kernel.org,
	linux-scsi <linux-scsi@vger.kernel.org>
Subject: Re: Update to SCSI trees for Linux Next
Date: Thu, 26 Apr 2012 13:21:09 -0700	[thread overview]
Message-ID: <CAA9_cmcWz3uWJTHs1Efe4NWpD9KQaxXzpWHVuG6G5uoyMwEA5g@mail.gmail.com> (raw)
In-Reply-To: <1335177821.4191.17.camel@dabdike.lan>

On Mon, Apr 23, 2012 at 3:43 AM, James Bottomley
<James.Bottomley@hansenpartnership.com> wrote:
> Hi Stephen
>
> Just to let you know that SCSI is moving on to a single tree model from
> now on.  The new tree is
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
>
> And the branch for next is for-next.
>
> Could you drop both the scsi-misc-2.6 and scsi-rc-fixes-2.6 tree, please
> because I'll send everything through this for-next branch.
>
> For the time being, could you keep the scsi-post-merge-2.6 tree?  It's
> easier when resolving conflicts amongst other trees to use a separate
> git tree (although we haven't actually had to use this one for a while).

Speaking of resolving conflicts, are you looking to resolve conflicts
between scsi/fixes and development branches targeted at the next merge
window?  Or, would you rather ask the development branch to rebase on
top of latest Linus once scsi/fixes lands upstream?

My libsas development branch, if I base it on current Linus, will
conflict with the bits queued in scsi/fixes.

--
Dan

      parent reply	other threads:[~2012-04-26 20:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-23 10:43 Update to SCSI trees for Linux Next James Bottomley
2012-04-23 11:11 ` Stephen Rothwell
2012-04-26 20:21 ` Dan Williams [this message]

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=CAA9_cmcWz3uWJTHs1Efe4NWpD9KQaxXzpWHVuG6G5uoyMwEA5g@mail.gmail.com \
    --to=dan.j.williams@gmail.com \
    --cc=James.Bottomley@hansenpartnership.com \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-scsi@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.