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;
Date:   Mon, 9 Nov 2020 14:14:46 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Thomas Gleixner <tglx@linutronix.de>, 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: linux-next: manual merge of the tip tree with the block tree
Message-ID: <20201109141446.3370914b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Tcn5_2_DZDwAsyCr67qhFql";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Tcn5_2_DZDwAsyCr67qhFql
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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.

I fixed it up (I just used the former versions - this may be wrong,
please let me know) and can carry the fix as necessary. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging.  You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.


--=20
Cheers,
Stephen Rothwell

--Sig_/Tcn5_2_DZDwAsyCr67qhFql
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl+otCYACgkQAVBC80lX
0Gw/JAf/U3/EL0KIfWk/Iq0zOsHJGPii43F+DNfwoyFvKj8uvV/5hurnGJwn0fqR
xEVaKzuB1URdk/n6IUYUM8oYFa3fSETAOmK4ttPpRKQcrBOU45FrBMJFSR+BijvY
LXCx2DS0XZXrZy40VcQm4eb4tEPZ/rLSA5SqiWwQA2gqsoXydarqDkRTpx+ZpTPS
uTJZjw5PFMCxrP/cyUS0CetDi9VmJ/KveFvP0tqBngPJsyI6/9F/+KtbO1eKknMO
h2v9cPQb723+dVR4rFMjuaBWZpsc/NV9LGLjJaoRSCT7UVjo19yPvtFqGoEl1c7D
+l5NIGLTXPk/xDizEMNSOoU/LVjGPw==
=3fGX
-----END PGP SIGNATURE-----

--Sig_/Tcn5_2_DZDwAsyCr67qhFql--