Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Date:   Fri, 27 May 2022 10:39:16 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
        ARM <linux-arm-kernel@lists.infradead.org>
Cc:     Geert Uytterhoeven <geert@linux-m68k.org>,
        Laurent Vivier <laurent@vivier.eu>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Nick Hawkins <nick.hawkins@hpe.com>
Subject: linux-next: manual merge of the arm-soc tree with Linus' tree
Message-ID: <20220527103916.52768f74@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/A4WshG/iaHUmiVjQ9d8usu6";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  drivers/clocksource/Makefile

between commit:

  c92e7ef16400 ("clocksource/drivers: Add a goldfish-timer clocksource")

from Linus' tree and commit:

  5184f4bf151b ("clocksource/drivers/timer-gxp: Add HPE GXP Timer")

from the arm-soc tree.

I fixed it up (see below) 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

diff --cc drivers/clocksource/Makefile
index 833cfb7a96c1,98017abf6c03..000000000000
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -85,4 -88,4 +85,5 @@@ obj-$(CONFIG_GX6605S_TIMER)		+=3D timer-g
  obj-$(CONFIG_HYPERV_TIMER)		+=3D hyperv_timer.o
  obj-$(CONFIG_MICROCHIP_PIT64B)		+=3D timer-microchip-pit64b.o
  obj-$(CONFIG_MSC313E_TIMER)		+=3D timer-msc313e.o
 +obj-$(CONFIG_GOLDFISH_TIMER)		+=3D timer-goldfish.o
+ obj-$(CONFIG_GXP_TIMER)			+=3D timer-gxp.o

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKQHbUACgkQAVBC80lX
0GxmkAf+IlXFtVv11tdgfgbTGeykCJuCJBfmzl1/ebiKhg6cfnSdsAMTE9UM0y1d
bCokBkLpoo8M1T6+ar5F503I96b5sxrQKo6/cxhYnTp7N7vveZKvK/g+7u0QFg4b
daPaRVQjwAZ8hBgAm3QPDw4H5dCvZt6/sasiB+HTg81OTZlgmEQ4Bw4yG+oIs5qA
iwCx2QlqW6eJrGkjfMFErZWxsJW998NP/Y2PTlYuZzGJMtqZGbfYwpdjXFfhn2E1
hO07SFobezM0yMS6pTXdDJIQvXun10lr4/0SXWP2fFReDg2MhU9dw7jHG+aHFAKW
lO2vPmB/MRTWy9BEu3LV+tCfXKzc2g==
=Yef4
-----END PGP SIGNATURE-----

--Sig_/A4WshG/iaHUmiVjQ9d8usu6--