Mark Lord wrote:
For upstream-linus, please.
Any volunteers wanna format and post this to the wiki?
http://ata.wiki.kernel.org/
For what it's worth, upstream-linus is for Linus only, not for anyone else.
Relevant branches of libata-dev.git:
ALL All libata code I consider acceptable for public
testing. Intended for Andrew Morton's -mm tree,
but I am always looking for people to help test!
NEXT libata code intended for current kernel + 1
This is a subset of ALL, and is intended for
the linux-next tree, and even more rigorous
public testing.
upstream-fixes This branch exists when the merge window is NOT open.
Fixes queued for Linus go here, during -rc. Generally
I push to Linus pretty rapidly, though, so programmers
are encouraged to send patches diff'd against Linus
upstream during -rc.
upstream libata code intended for current kernel + 1. When the
merge window is closed, patches are queued here. When
the merge window is open, fixes for Linus are also
queued here.
Generally upstream==NEXT, but this is not guaranteed.
i.e. sometimes I will put a fix on a separate git
branch, and then merge that into the mix, such that
NEXT == upstream + fix-that-needs-testing
And then there are individual branches that pop in and out of existence,
as I do my own work. For example, currently active branches are
fixes-eh-freeze Freeze ordering fix recently discussed; needs some
codepath review before I am sure it is safe. (NEXT)
libahci libahci patchset recently posted (NEXT, ALL)
sectsize Variable sector size patch. Will not go into
#upstream branch until I satisfy some request of
willy's, which slips my mind at the moment (ALL)
sx4 sata_sx4 new EH conversion (ALL)
And last, but not least,
master Vanilla Linux kernel, with no changes from me.
Exists to indicate the root of all above branches,
so that "git log master..libahci" or
"git diff master..upstream" works as expected.
NOTE: All of the branches except 'master' may be rebased.
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
