[PATCH] staging:lustre:libcfs: Merge linux-proc.c into module.c

[Matt Tyler]

hey greg, I've updated to the latest linux-next, applied the patch and compiled with no issues.

I think it might be due to clashes with another patch that has been proposed by Tal Shorer to fix style violations in linux-proc.c (which my patch merges into module.c)

Tal - do you want to take my patch, apply it onto your tree, and then apply the style fixes? It shouldn't be too difficult to merge our patches into one series?

On Sun, Mar 01, 2015 at 05:27:01PM -0800, Greg KH wrote:
> On Tue, Feb 10, 2015 at 07:24:40PM +0800, Matt Tyler wrote:
> > module.c was previously the sole exporter of symbols from module.c
> > This patch removes the global symbols by merging the two files.
> > 
> > Signed-off-by: Matthew Tyler <matt.tyler at flashics.com>
> > ---
> >  drivers/staging/lustre/lustre/libcfs/Makefile      |   2 +-
> >  .../lustre/lustre/libcfs/linux/linux-proc.c        | 577 ---------------------
> >  drivers/staging/lustre/lustre/libcfs/module.c      | 546 ++++++++++++++++++-
> >  3 files changed, 540 insertions(+), 585 deletions(-)
> >  delete mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
> 
> This doesn't apply to my tree :(