Received-SPF: pass (google.com: domain of linux-kernel+bounces-36305-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Wed, 24 Jan 2024 13:26:05 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Oded Gabbay <ogabbay@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>, Dafna Hirschfeld
 <dhirschfeld@habana.ai>, 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 accel tree with Linus' tree
Message-ID: <20240124132605.4f6681de@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/z/8dOFjR0p0mC.Xa5RdR8V7";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/z/8dOFjR0p0mC.Xa5RdR8V7
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the accel tree got a conflict in:

  drivers/accel/habanalabs/common/device.c

between commits:

  3652117f8548 ("eventfd: simplify eventfd_signal()")
  b7638ad0c780 ("eventfd: make eventfd_signal{_mask}() void")

from Linus' tree and commit:

  1436a2242aa5 ("accel/habanalabs: check failure of eventfd_signal")

from the accel tree.

I fixed it up (I just used the former version) 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 cooperat=
ing
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

--Sig_/z/8dOFjR0p0mC.Xa5RdR8V7
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWwdT0ACgkQAVBC80lX
0GxtBQf+Ot0VNm+vJ0mL8LWFWmvJRIu/hkTHFxWcCXzteLPgmHmgQqleW/aINGun
fX66MMkP6EzCca75OJvV+MDZfQAfn/6pNHThSbxSVSqpTuViz8CkMlE1X4IJT07a
b+GkbVU8mV/X4hWrXO6+ClWCsNFtlKW5++MEnh109xEUMddwRCrL1DhLVWlaE1/P
Hr+0NFh+hNu8EXD9Kr3rnB6xiEktJsDfxUXaDgrjVRgsF+70UkUddhbU2fS5YOzS
EDCjZcb+j081ojZaCFHXSeKD+2AS6VHuSHo5MuugspbeRekCGZNC7vZnw9dq9E4t
g3n2wmO4fyHdmJVqFghWJTgTERal8g==
=rMWl
-----END PGP SIGNATURE-----

--Sig_/z/8dOFjR0p0mC.Xa5RdR8V7--