SCSI git tree splitting into scsi-misc-2.6 and scsi-post-merge-2.6

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Due to conflicts with block#for-2.6.28 I'm splitting the tree to resolve
them.  The two trees are now

git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git
git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git

scsi-misc-2.6 will keep things that have no external dependencies, so
will be merged very early in the merge window.  scsi-post-merge-2.6 will
keep the other tree dependent pieces, and so won't be able to go until
after the other trees have gone in.

Since the trees will evolve semi-independently, you'll need to pull both
in to get all the changes.

Instructions for linux-next:

You need to include the scsi-post-merge-2.6 tree last (or at least after
all its component trees) and only the pieces from merge-base..master
(that will insulate you from rebasing effects).

James


--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux