linux-staging/linux-next merge/build errors

[Stephen Rothwell]

Hi Greg,

Today I have done a test merge of linux-staging into linux-next.  I got
merge conflicts in drivers/char/agp/via-agp.c and drivers/misc/Makefile -
neither of which is really surprising and both tivial to fix up.

I then did an x86 allmodconfig build with these errors:

In file included from /home/sfr/kernels/next/src/drivers/char/drm/via_chrome9_drm.c:32:
/home/sfr/kernels/next/src/drivers/char/drm/via_chrome9_3d_reg.h: In function âIS_AGPHEADER_INVâ:
/home/sfr/kernels/next/src/drivers/char/drm/via_chrome9_3d_reg.h:230: error: âTRUEâ undeclared (first use in this function)
/home/sfr/kernels/next/src/drivers/char/drm/via_chrome9_3d_reg.h:230: error: (Each undeclared identifier is reported only once
/home/sfr/kernels/next/src/drivers/char/drm/via_chrome9_3d_reg.h:230: error: for each function it appears in.)
/home/sfr/kernels/next/src/drivers/char/drm/via_chrome9_3d_reg.h:232: error: âFALSEâ undeclared (first use in this function)

And several new warnings (these may not be all):

/home/sfr/kernels/next/src/fs/novfs/inode.c:265: warning: initialization from incompatible pointer type
/home/sfr/kernels/next/src/fs/novfs/inode.c:267: warning: initialization from incompatible pointer type
/home/sfr/kernels/next/src/fs/novfs/inode.c:273: warning: initialization from incompatible pointer type
/home/sfr/kernels/next/src/fs/novfs/inode.c:275: warning: initialization from incompatible pointer type
In file included from /home/sfr/kernels/next/src/fs/novfs/daemon.c:24:
include2/asm/semaphore.h:1:2: warning: #warning Use linux/semaphore.h, not asm/semaphore.h
In file included from /home/sfr/kernels/next/src/fs/novfs/scope.c:26:
include2/asm/semaphore.h:1:2: warning: #warning Use linux/semaphore.h, not asm/semaphore.h
In file included from /home/sfr/kernels/next/src/fs/novfs/nwcapi.c:22:
include2/asm/semaphore.h:1:2: warning: #warning Use linux/semaphore.h, not asm/semaphore.h

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature