Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
Date:   Mon, 25 Sep 2023 12:09:08 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, Arnd Bergmann <arnd@arndb.de>,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>
Cc:     Ard Biesheuvel <ardb@kernel.org>,
        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 block tree with the asm-generic
 tree
Message-ID: <20230925120908.4b15c44d@canb.auug.org.au>
In-Reply-To: <20230925120544.7b1baece@canb.auug.org.au>
References: <20230925120544.7b1baece@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/4iDlT0te4T54MwelldPzrRR";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

On Mon, 25 Sep 2023 12:05:44 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the block tree got a conflict in:
>=20
>   arch/ia64/kernel/syscalls/syscall.tbl
>=20
> between commit:
>=20
>   cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
>=20
> from the asm-generic tree and commits:
>=20
>   9f6c532f59b2 ("futex: Add sys_futex_wake()")
>   cb8c4312afca ("futex: Add sys_futex_wait()")
>   0f4b5f972216 ("futex: Add sys_futex_requeue()")
>=20
> from the block tree.

These three commits are also in the tip tree.

> I fixed it up (I just removed the file) 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_/4iDlT0te4T54MwelldPzrRR
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUQ68QACgkQAVBC80lX
0Gyp6Qf/SOObiUMbuIWhKFwtS+J/xHobxRAjLrucovzWZl/mNLjzy1gR451WVNFH
wl9ZNbhEprauHPuofzEIfXnFnl7Saz7Igkd4jtKa5l+Dt8dzVAdHrbKhhcheKuz2
EcH7RmLkHEUVFEkWPL7UBGNhI9lbel+ZhA+Iuz0Qapp7ouxVb0oYT/g3pSFWjoyr
Fgi+ubk07H0OipoodFLB+EwJkACFySplZiVm4HaNS8VHpu6zMdpRgan2g14KqCGX
unrLRoKmRJlFO67J5QcLwHd5Go+Xlu9sro+8faD5B9SCp7+uYWlnFLL1rGdP5U71
Is9zk5mln7BixxQ8+BiZ6I+xnWcCkQ==
=THaW
-----END PGP SIGNATURE-----

--Sig_/4iDlT0te4T54MwelldPzrRR--