linux-next: build failure after merge of the userns tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]

Hi Eric,

After merging the userns tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

fs/namespace.c: In function 'new_mountpoint':
fs/namespace.c:725:9: error: implicit declaration of function 'hash' [-Werror=implicit-function-declaration]
  struct list_head *chain = mountpoint_hashtable + hash(NULL, dentry);
         ^
fs/namespace.c:725:28: warning: initialization from incompatible pointer type [enabled by default]
  struct list_head *chain = mountpoint_hashtable + hash(NULL, dentry);
                            ^
fs/namespace.c:741:2: warning: passing argument 2 of 'hlist_add_head' from incompatible pointer type [enabled by default]
  hlist_add_head(&mp->m_hash, chain);
  ^
In file included from include/linux/signal.h:4:0,
                 from include/linux/syscalls.h:72,
                 from fs/namespace.c:11:
include/linux/list.h:637:20: note: expected 'struct hlist_head *' but argument is of type 'struct list_head *'
 static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
                    ^

So clearly my merge conflict resolution was not sufficient.

I will just drop the userns tree for today.  Please give me some help
with the resolutions - or fix this stuff up yourselves.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]