Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Thomas Gleixner <tglx@linutronix.de>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Jens Axboe <axboe@kernel.dk>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the block tree
In-Reply-To: <20201109141446.3370914b@canb.auug.org.au>
References: <20201109141446.3370914b@canb.auug.org.au>
Date:   Mon, 09 Nov 2020 14:45:13 +0100
Message-ID: <871rh2k5jq.fsf@nanos.tec.linutronix.de>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

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