From: ebiederm@xmission.com (Eric W. Biederman)
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Al Viro <viro@zeniv.linux.org.uk>,
David Howells <dhowells@redhat.com>
Subject: Re: linux-next: build failure after merge of the userns tree
Date: Thu, 17 Apr 2014 00:18:44 -0700 [thread overview]
Message-ID: <87bnw0ctkb.fsf@x220.int.ebiederm.org> (raw)
In-Reply-To: <20140417151245.467efa8bd8d084277fd471c9@canb.auug.org.au> (Stephen Rothwell's message of "Thu, 17 Apr 2014 15:12:45 +1000")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 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.
You had this exact conflict succesfully resolved yesterday. Sigh.
Line 725 of fs/namespace.c: Simply need to read.
struct hlist_head *chain = mp_hash(dentry);
Eric
next prev parent reply other threads:[~2014-04-17 7:18 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-17 5:12 linux-next: build failure after merge of the userns tree Stephen Rothwell
2014-04-17 7:18 ` Eric W. Biederman [this message]
2014-04-22 1:34 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-03-16 5:56 Stephen Rothwell
2022-03-16 13:54 ` Eric W. Biederman
2021-12-17 7:34 Stephen Rothwell
2021-12-17 16:53 ` Eric W. Biederman
2021-12-17 7:13 Stephen Rothwell
2021-10-20 3:46 Stephen Rothwell
2021-10-20 16:00 ` Eric W. Biederman
2021-10-07 3:47 Stephen Rothwell
2021-10-07 18:56 ` Eric W. Biederman
2020-05-21 8:22 Stephen Rothwell
2018-03-28 7:41 Stephen Rothwell
2018-03-28 18:32 ` Eric W. Biederman
2018-01-26 1:05 Stephen Rothwell
2018-01-26 2:45 ` Eric W. Biederman
2017-07-20 3:25 Stephen Rothwell
2017-07-20 12:17 ` Eric W. Biederman
2015-05-25 10:39 Stephen Rothwell
2013-11-08 7:07 Stephen Rothwell
2013-11-08 23:15 ` Eric W. Biederman
2013-11-11 5:25 ` Stephen Rothwell
2013-11-08 6:58 Stephen Rothwell
2013-11-08 7:27 ` Christoph Hellwig
2013-11-08 15:55 ` Al Viro
2013-11-08 22:50 ` Eric W. Biederman
2013-11-09 8:32 ` Christoph Hellwig
2012-09-24 12:18 Stephen Rothwell
2012-05-21 7:50 Stephen Rothwell
2012-05-21 22:05 ` Eric W. Biederman
2012-05-14 9:13 Stephen Rothwell
2012-05-16 1:12 ` Eric W. Biederman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bnw0ctkb.fsf@x220.int.ebiederm.org \
--to=ebiederm@xmission.com \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).