linux-next: manual merge of the staging tree with the vfs tree

From: Stephen Rothwell
Date: Sun Dec 14 2014 - 23:06:34 EST

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 sfr@xxxxxxxxxxxxxxxx

Attachment: pgpMj6tsL46lv.pgp
Description: OpenPGP digital signature