Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1295709 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-12-21 00:40 +0100 |
| Last post | 2015-12-21 00:40 +0100 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the orangefs tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-21 00:40 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-12-21 00:40 +0100 |
| Subject | linux-next: manual merge of the orangefs tree with Linus' tree |
| Message-ID | <qHVK1-7bV-1@gated-at.bofh.it> |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to top | Article view | linux.kernel
csiph-web