Re: linux-next: build failure after merge of the keys tree

Stephen Rothwell
2020-02-11T23:23:14Z

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

Hi all,

On Mon, 10 Feb 2020 10:07:43 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 10 Feb 2020 10:05:55 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the keys tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
>
> kernel/watch_queue.c: In function 'post_one_notification':
> kernel/watch_queue.c:89:21: error: 'struct pipe_inode_info' has no member named 'wait'
> 89 | spin_lock_irq(&pipe->wait.lock);
> | ^~
> kernel/watch_queue.c:122:24: error: 'struct pipe_inode_info' has no member named 'wait'
> 122 | spin_unlock_irq(&pipe->wait.lock);
> | ^~
> In file included from include/linux/mmzone.h:10,
> from include/linux/gfp.h:6,
> from include/linux/umh.h:4,
> from include/linux/kmod.h:9,
> from include/linux/module.h:16,
> from kernel/watch_queue.c:11:
> kernel/watch_queue.c:125:46: error: 'struct pipe_inode_info' has no member named 'wait'
> 125 | wake_up_interruptible_sync_poll_locked(&pipe->wait, EPOLLIN | EPOLLRDNORM);
> | ^~
> include/linux/wait.h:234:29: note: in definition of macro 'wake_up_interruptible_sync_poll_locked'
> 234 | __wake_up_locked_sync_key((x), TASK_INTERRUPTIBLE, poll_to_key(m))
> | ^
> kernel/watch_queue.c:129:23: error: 'struct pipe_inode_info' has no member named 'wait'
> 129 | spin_unlock_irq(&pipe->wait.lock);
> | ^~
>
> > Caused by commit(s) in the keys tree interacting with commit
> >
> > 0ddad21d3e99 ("pipe: use exclusive waits when reading or writing")
> >
> > from Linus' tree.
> >
> > Given that I haven't seen a pull request for the keys tree yet, it seems
> > that this work will not be in v5.6, so I have just dropped the keys tree
> > for today.

From today, I have just disabled CONFIG_WATCH_QUEUE instead of dropping
the keys tree completely. Please let me know when it has been fixed up
in case I don't notice.