Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751844AbbKJWwZ (ORCPT ); Tue, 10 Nov 2015 17:52:25 -0500 Received: from mail-ig0-f169.google.com ([209.85.213.169]:36889 "EHLO mail-ig0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751284AbbKJWwY (ORCPT ); Tue, 10 Nov 2015 17:52:24 -0500 MIME-Version: 1.0 In-Reply-To: <1447126404-10567-3-git-send-email-olof@lixom.net> References: <1447126404-10567-1-git-send-email-olof@lixom.net> <1447126404-10567-3-git-send-email-olof@lixom.net> Date: Tue, 10 Nov 2015 14:52:23 -0800 X-Google-Sender-Auth: SflTAQN7RzgLqE-bbSQvcwq8Lkk Message-ID: Subject: Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4 From: Linus Torvalds To: Olof Johansson 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: 617 Lines: 17 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. Linus -- 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/