* Update to SCSI trees for Linux Next
@ 2012-04-23 10:43 James Bottomley
2012-04-23 11:11 ` Stephen Rothwell
2012-04-26 20:21 ` Dan Williams
0 siblings, 2 replies; 3+ messages in thread
From: James Bottomley @ 2012-04-23 10:43 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-scsi
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).
Thanks,
James
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Update to SCSI trees for Linux Next
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
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-04-23 11:11 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-next, linux-scsi
[-- Attachment #1: Type: text/plain, Size: 794 bytes --]
Hi James,
On Mon, 23 Apr 2012 11:43:41 +0100 James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
>
> 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.
Done.
> 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).
No problem.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Update to SCSI trees for Linux Next
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
1 sibling, 0 replies; 3+ messages in thread
From: Dan Williams @ 2012-04-26 20:21 UTC (permalink / raw)
To: James Bottomley; +Cc: Stephen Rothwell, linux-next, linux-scsi
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-26 20:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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.