Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754688Ab2BPTjl (ORCPT ); Thu, 16 Feb 2012 14:39:41 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:49025 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751791Ab2BPTjj (ORCPT ); Thu, 16 Feb 2012 14:39:39 -0500 MIME-Version: 1.0 In-Reply-To: <74CDBE0F657A3D45AFBB94109FB122FF1790EC8791@HQMAIL01.nvidia.com> References: <1329417828-6005-1-git-send-email-linus.walleij@linaro.org> <74CDBE0F657A3D45AFBB94109FB122FF1790EC8791@HQMAIL01.nvidia.com> Date: Thu, 16 Feb 2012 20:39:39 +0100 Message-ID: Subject: Re: [PATCH] serial/sirf: fixup for changes to pin control From: Linus Walleij To: Stephen Warren Cc: "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Shawn Guo , Thomas Abraham , Dong Aisheng , Rajendra Nayak , Haojian Zhuang , Barry Song <21cnbao@gmail.com>, Tony Lindgren , "linux-serial@vger.kernel.org" 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 Content-Length: 919 Lines: 24 On Thu, Feb 16, 2012 at 8:01 PM, Stephen Warren wrote: > Should this patch be put into the pinctrl tree since that's where the > API changed, perhaps even squashed into the original commit to avoid > git bisect breakage, unless your branch needs to be stable? Hm yeah I will for sure put it into the pinctrl tree. The Sirf doesn't even have a defconfig so it was just my memory of the Sirf that got me to remember it. I might squash if I don't get any comments on this patch. > Otherwise, > this change will conflict with my future similar change if pulled for > the same kernel version. It'll be in linux-next tomorrow or so. Yours, Linus Walleij -- 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/