From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751951Ab2IPWqY (ORCPT ); Sun, 16 Sep 2012 18:46:24 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:62800 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751601Ab2IPWqX (ORCPT ); Sun, 16 Sep 2012 18:46:23 -0400 MIME-Version: 1.0 In-Reply-To: <20120916223541.GA26353@n2100.arm.linux.org.uk> References: <1347658492-11608-1-git-send-email-arnd@arndb.de> <1347658492-11608-7-git-send-email-arnd@arndb.de> <20120916223541.GA26353@n2100.arm.linux.org.uk> Date: Mon, 17 Sep 2012 00:46:21 +0200 Message-ID: Subject: Re: [PATCH 06/24] ARM: integrator: use __iomem pointers for MMIO From: Linus Walleij To: Russell King - ARM Linux Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Will Deacon , Nicolas Pitre Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 17, 2012 at 12:35 AM, Russell King - ARM Linux wrote: > On Mon, Sep 17, 2012 at 12:19:11AM +0200, Linus Walleij wrote: >> >> However if Russell applies some of the stuff that is pending >> in his tracker (was pending uncertain acceptance of >> CONFIG_ATAGS, which is merged now) this will likely >> conflict. > > I'm actually a little confused... 7514/1 apparantly has a comment from > me on it, but I don't remember making any comments against it - and the > comment is definitely crap for the patch. I certainly wasn't processing > patches at 20:38 on Friday 7th, so, I'm wondering what's going on there. I'm as confused as you are :-( On some of the other patches I added a changelog, but this one doesn't have one, and I don't remember seeing that comment until now. Do you want me to resubmit it as 7514/2? Yours, Linus Walleij