James, Greg,

please disregard my four patches. This was an accident and I'm going to resend them correctly. I'm sorry.

Steffen

On Di, 2012-08-14 at 17:23 +0200, Steffen Maier wrote:
plain text document attachment (704-scsi-git-tree-update.patch)
From: Steffen Maier <[email protected]>

In http://marc.info/?l=linux-scsi&m=133517794218707&w=2
James wrote on 2012-04-23:
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).

Signed-off-by: Steffen Maier <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: <[email protected]> #3.4+
---
  MAINTAINERS |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5947,9 +5947,9 @@ F:        include/scsi/sg.h
  SCSI SUBSYSTEM
  M:    "James E.J. Bottomley" <[email protected]>
  L:    [email protected]
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
-T:     git 
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
-T:     git 
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-pending-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git misc
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git fixes
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git for-next
  S:    Maintained
  F:    drivers/scsi/
  F:    include/scsi/


--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to