linux-next: manual merge of the orangefs tree with Linus' tree

[Stephen Rothwell]

Hi Mike,

Today's linux-next merge of the orangefs tree got a conflict in:

  Makefile

between commit:

  1ec218373b8e ("Linux 4.4-rc2")

from Linus' tree and commit:

  575e946125f7 ("Orangefs: change pvfs2 filenames to orangefs")

from the orangefs tree.

You should really remove this EXTRAVERSION change from the patch.

I fixed it up (I use Linus' tree verison) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/