Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966053AbbBCFbu (ORCPT ); Tue, 3 Feb 2015 00:31:50 -0500 Received: from ozlabs.org ([103.22.144.67]:54060 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966020AbbBCFbr (ORCPT ); Tue, 3 Feb 2015 00:31:47 -0500 Date: Tue, 3 Feb 2015 16:31:40 +1100 From: Stephen Rothwell To: Mike Turquette , Olof Johansson , Arnd Bergmann , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tero Kristo , Tony Lindgren Subject: linux-next: manual merge of the clk tree with the arm-soc tree Message-ID: <20150203163140.3edfe607@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/y8x1EsziUO=Vs3LsBS5UpqJ"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1827 Lines: 47 --Sig_/y8x1EsziUO=Vs3LsBS5UpqJ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Mike, Today's linux-next merge of the clk tree got a conflict in arch/arm/mach-omap2/cclock3xxx_data.c between commit ca662ee7b8a8 ("ARM: OMAP2+: Remove unused ti81xx platform init code") from the arm-soc tree and commit d6540b193719 ("ARM: OMAP3: remove legacy clock data") from the clk tree. I fixed it up (the latter removed the file, so I did that) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/y8x1EsziUO=Vs3LsBS5UpqJ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJU0F1BAAoJEMDTa8Ir7ZwVwUsQAI+Mp/WQycBCtuJXUjSN71mY HIeUD6AeFoctEawQpDCiRbZhW5jtMgSehEOUFTa0tcxLQ35NnFAimWyxwM0gTD0O 6SqrHtjSU5GWEMr3wlAFgb2nbVgabPjYxo88NWsyN4/HQBsIMclgWSPdlTqUkmJC 59DHrJzgJpNBekSV7iEnz4RgtEb5ssYj273w1GhmQzzLbym+7PGg5Az1FtYoUocv NOOSHl4A+BGfhol6B6gSwLTY1iKq650zEAqUcN3QuEPynkbUi0ZMvMJU3OVW8YVe ReTkjpCW0UAgFlib0o1LfixefHCwBIAKkolWp6nh8GlM4XV2l2c03Am0n9f6ZM/P 9XIAXKXbQsVkeB46tOt17/aKn93ENR5Flkarb9/3ODEt6iQO1FbBtSxhjcy0VeBC En0jBwVn4oR1GOPRtIJlVaKCzvhtJoRUZimH1GVjzCz01N7UYMDuQiTf42i8k9T8 BKBD/EZ4mvJASZR2FzfnQWRZFPekMXlNhkHtVYCpsdPQT1+++WgkLWVKYosBMfDf MGJsA8G0GQ5qfi5tF8yuahRM138Et8LshD9o0KZM1WclFvgctbOARn5xmThpSbyB kSUIKeGbm/wXhquxHdS45LjV4AxUxGydrBIE21Rz/e1f30AIuA30i6nSDvcLEnPg AsSkZzgQWl3Qo+WLPS6Z =3Awh -----END PGP SIGNATURE----- --Sig_/y8x1EsziUO=Vs3LsBS5UpqJ-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/