[lkml]   [2015]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-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:


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).

Stephen Rothwell

 \ /
  Last update: 2015-12-21 01:01    [W:0.027 / U:0.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site