https://bugzilla.kernel.org/show_bug.cgi?id=47611 --- Comment #4 from Theodore Tso <tytso@xxxxxxx> 2012-09-17 14:08:30 --- Oh, my bad. I hadn't pushed the master branch forward even though the patch had been sent to Linus and merged for 3.6-rc3. The ext4 git tree has three branches of interest. Internally, I work off of an ext4 patch queue which can be found here: git://repo.or.cz/ext4-patch-queue.git or here: https://github.com/tytso/ext4-patch-queue.git The base of the patch series is the "origin" branch on the ext4 git tree, and that is always a commit which is in Linus's mainline. The last "stable patch" (before the "stable-boundary" no-op patch in the ext4 patch queue) is what is generally on the "dev" branch, and that is what is synched-up with linux-next. The "master" branch supposed to live on a commit somewhere between "origin" and "dev", and represents a commitment that everything at or before the "master" branch pointer is a stable commit that I will not rewind or rebase. Commits between "master" and "dev" are stable, and will probably not be rebased, but the commit description might change, or if a critical bug is found, a commit might require revision, or in rare cases, might get dropped. So if you are doing developement using git, you're better off using the "master" branch, since that is a non-rewinding branch. If you are just using patch series or some kind of patch queue (i.e., stgit, guilt, quilt, etc.) then it should be fine to use the "dev" branch. For example, at the moment the 64-bit resize patches are still not yet in master, although at this point they are pretty stable and will probably not change. Everything before the "master" branch, however, is guaranteed to be stable. -- Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching the assignee of the bug. -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
