Apparently there was a PEBKAC in my office on April 18. I pulled in a patch
twice (on separate hosts) and then didn't notice the merge commit when I
Rather than pollute the upstream tree with this garbage I have chosen to
rebase the master branch at git://oss.sgi.com/xfs/xfs. You'll notice that
now it doesn't contain 64a97f1 and 576f1a5. Other than that it is the same
The old branch can still be found here:
I'll keep this 'bad' branch around for awhile for reference.
Anyone working on xfs atop the old master branch will need to rebase his or
her changes onto the new one. I apologise for any inconvenience.