Re: linux-next: manual merge of the tip tree with the block tree

[Thomas Gleixner]

On Mon, Nov 09 2020 at 14:14, Stephen Rothwell wrote:
> Today's linux-next merge of the tip tree got a conflict in:
>
>   include/linux/sched/signal.h
>   include/linux/tracehook.h
>   kernel/signal.c
>   kernel/task_work.c
>
> between commits:
>
>   fdb5f027ce66 ("task_work: use TIF_NOTIFY_SIGNAL if available")
>   bf6996650675 ("task_work: remove legacy TWA_SIGNAL path")
>   ceb39b7c17b7 ("kernel: remove checking for TIF_NOTIFY_SIGNAL")
>
> from the block tree and commit:
>
>   114518eb6430 ("task_work: Use TIF_NOTIFY_SIGNAL if available")
>   12db8b690010 ("entry: Add support for TIF_NOTIFY_SIGNAL")
>
> from the tip tree.

Jens, how is that supposed to work?

You need to merge the 'core-entry-notify-signal' tag from the tip tree
into your next branch to make the follow up changes actually work.

Ideally you send the whole arch + core cleanup muck my way once the
architecture people are happy.

Thanks,

        tglx