[lkml]   [2014]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the staging tree with the vfs tree
Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/lustre/lustre/llite/llite_lib.c between commit
6a661bd6ffba ("lustre: get rid of playing with ->fs") from the vfs tree
and commit 9c234f6cb4c4 ("drivers: staging: lustre: Fix "'foo* bar'
should be 'foo *bar'" errors") from the staging tree.

I fixed it up (the former removed te code changed by the latter) and
can carry the fix as necessary (no action is required).

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2014-12-15 05:21    [W:0.023 / U:1.220 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site