Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751721AbbKJW6n (ORCPT ); Tue, 10 Nov 2015 17:58:43 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:58248 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751028AbbKJW6m (ORCPT ); Tue, 10 Nov 2015 17:58:42 -0500 From: Felipe Balbi To: Linus Torvalds , Olof Johansson CC: ARM SoC , Linux Kernel Mailing List , "linux-arm-kernel@lists.infradead.org" Subject: Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4 In-Reply-To: References: <1447126404-10567-1-git-send-email-olof@lixom.net> <1447126404-10567-3-git-send-email-olof@lixom.net> User-Agent: Notmuch/0.21 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-pc-linux-gnu) Date: Tue, 10 Nov 2015 16:58:09 -0600 Message-ID: <87y4e5sbr2.fsf@saruman.tx.rr.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1870 Lines: 52 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi, Linus Torvalds writes: > On Mon, Nov 9, 2015 at 7:33 PM, Olof Johansson wrote: >> >> Conflicts: >> >> OMAP timer code has a treewide fix vs code deletion conflict. Delete >> the code in HEAD, go with contents from branch. > > That doesn't look right. It also needs the clocksource_of_init -> > clocksource_probe changes. The code was moved around rather than > deleted. correct. Moved from arch/arm/mach-omap2/ to drivers/clocksource/. We're trying to get all our timer code to drivers/clocksource and make it DT-only (when all other platforms switch away from legacy boot). =2D-=20 balbi --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWQnaDAAoJEIaOsuA1yqRERssQAJLxy3KdjnzM3kZMEnl/kdT1 IpcFDhly8/Y1wxi1Aw7wDAy0R1xDT9EqYM0StKjhjK7GBouraCFQ9VAk4oQ3W4bo +ukYKXxlgggRPAl1JYh18hVOW3zRSOIfuXPZnlpQZBJHe0nuUhow7XBe2lAO/Aka j5AE6i7AXn42ga+hTCp/4NFZUr8fazJa9P/oubb5kn4VblMnFf5XOePMDt+85Cbc OuVLV4cJ7r5JfabCGWhD/+JA4n2aqPh5IsKz++zkCbdwVSb3r43Dqhf9OmsGNnR3 KGqMv03HniNQ3CdxN9t10z0f6palt0v+Yx3Mpy5nbJ6Rb3xZkm4cuxl5+0IHa5Di PJhyUroGkApnog8BMc247giVMLqoi5tcgfVGUDetUi8hshezv8pzXtb3Tb8cceF9 RNFN+1p1LBdcOuUqAoCvbHm9pBD7Y/4fK4u0E3kcFVQibXmZu1dyuQs+6gL9ycme M5Hx92Fwk3Bo/w2gtllzLSlPYLi3Ezirs7Dih2cXEriXuGlD/lWBPUMBwdDFXOKk VfP9yxfPGVVqlcKv4zi/xzP3HEz4BhTJ5a9imxhIxKQ7fJKw6v4O5mmtvNTGjI/1 5Wh7w9O5BmHZP/JUr+hqT1VIRyb3R96A7EVc8tATlofmws6RfPP82fbGrMYdUjA7 hqhc0GVMHbYmWLorRzc1 =E9qr -----END PGP SIGNATURE----- --=-=-=-- -- 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/