Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752663AbbKJXXc (ORCPT ); Tue, 10 Nov 2015 18:23:32 -0500 Received: from mail-yk0-f174.google.com ([209.85.160.174]:32992 "EHLO mail-yk0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752077AbbKJXXb (ORCPT ); Tue, 10 Nov 2015 18:23:31 -0500 MIME-Version: 1.0 X-Originating-IP: [2620:0:1000:fd1f:6d00:3e2:f099:4048] In-Reply-To: References: <1447126404-10567-1-git-send-email-olof@lixom.net> <1447126404-10567-3-git-send-email-olof@lixom.net> Date: Tue, 10 Nov 2015 15:23:30 -0800 Message-ID: Subject: Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4 From: Olof Johansson To: Linus Torvalds Cc: ARM SoC , Linux Kernel Mailing List , "linux-arm-kernel@lists.infradead.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 889 Lines: 26 On Tue, Nov 10, 2015 at 2:52 PM, Linus Torvalds wrote: > 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. Argh, yes, of course. I usually build a local copy of the merged contents on top of your latest tree before sending the pull requests, but didn't this time. Thanks for catching this. -Olof -- 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/