Messages in this thread |  | | Date | Mon, 21 Dec 2015 10:31:06 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the orangefs tree with Linus' tree |
| |
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@canb.auug.org.au
|  |