[Cluster-devel] GFS2 -nmw tree

[Cluster-devel] GFS2 -nmw tree

[Steven Whitehouse]

Hi,

Linus pulled the fixes at the weekend, so I've rebased the -nmw tree on
Linus' latest kernel and added Ben's patch too. Not a lot in the tree at
the moment, do please send anything that you have pending since it is
probably not too long until the merge window, and I don't want to take
patches at the last minute if possible,

Steve.

[Cluster-devel] GFS2 -nmw tree

[Steven Whitehouse]

Hi,

Linus has pulled the fixes that I sent him yesterday, so I've rebased
the remaining GFS2 patches in -nmw on the latest upstream kernel as
usual,

Steve.

[Cluster-devel] GFS2 -nmw tree

[Steven Whitehouse]

Hi,

Now that the merge window is done, I've rebased the tree to -rc1 as per
usual. There are four patches in there at the moment, with more likely
to land very shortly. So after a quieter time recently, there are lots
of developments which are likely to be ready in the next short period,

Steve.

[Cluster-devel] GFS2 -nmw tree

[Steven Whitehouse]

Hi,

Linus has pulled the GFS2 -nmw git tree, so it is now empty again. I'll
accumulate patches here as usual to be added to the tree once -rc1 has
appeared,

Steve.

[Cluster-devel] GFS2 -nmw tree

[Steven Whitehouse]

Hi,

I pushed the patch set tidying up the link counts and merging inode.c
and ops_inode.c this morning. However, since I checked the tree out
again, I spotted that git has done a funny with the resulting files. It
looks like if you do:

git rm a
git mv b a
git commit -a

Then you land up with _both_ of a and b missing. The patch displayed ok
in the web interface, and appeared to show the right outcome, but the
"b" (in this case fs/gfs2/inode.c) was missing from the resulting tree.
So I've just done a quick update splitting the final patch in the series
into two, which has fixed the problem.

Sorry about that, if it has caused any confusion. It is exactly the same
changes, but now split over two patches,

Steve.

[Cluster-devel] GFS2 -nmw tree

[Steven Whitehouse]

Hi,

Since Linus pulled the patch from the -fixes tree, I've rebased the -nmw
tree on top of his latest tree again,

Steve.

[Cluster-devel] GFS2 -nmw tree

[Steven Whitehouse]

Hi,

I've rebased this today. Also, I've dropped out the (rather
controversial) tracepoints moving patch. It may well still make it into
the next merge window, but I don't want it to hold up the rest of the
tree so it seemed sensible to separate it for the time being. I hope
that agreement will be reached as to its fate shortly and by dropping it
for the time being I have given an extra incentive to one of the parties
to resolve the issue.

Steve.

[Cluster-devel] GFS2 -nmw tree

[Steven Whitehouse]

Hi,

The GFS2 -nmw tree was pulled by Linus yesterday, so I'm just about to
rebase the tree. It might take a little while for the mirrors to catch
up. There is currently nothing in the -fixes tree thats not already
upstream and I'll rebase that and update it when there is next something
ready to go in it,

Steve.