From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751968AbdBEEyt (ORCPT ); Sat, 4 Feb 2017 23:54:49 -0500 Received: from mail.kernel.org ([198.145.29.136]:49820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751832AbdBEEyr (ORCPT ); Sat, 4 Feb 2017 23:54:47 -0500 Date: Sun, 5 Feb 2017 12:54:30 +0800 From: Shawn Guo To: Guenter Roeck Cc: Baoyou Xie , Jun Nie , wim@iguana.be, Rob Herring , Mark Rutland , Mathieu Poirier , linux-arm Mailing List , linux-watchdog@vger.kernel.org, devicetree , Linux Kernel Mailing List , "xie.baoyou" , chen.chaokai@zte.com.cn, wang.qiang01@zte.com.cn Subject: Re: [PATCH v9 2/3] MAINTAINERS: add zx2967 watchdog controller driver to ARM ZTE architecture Message-ID: <20170205045429.GE3407@dragon> References: <1486172055-13162-1-git-send-email-baoyou.xie@linaro.org> <1486172055-13162-2-git-send-email-baoyou.xie@linaro.org> <4cba1be6-ee85-7371-ea02-1bf8e7eb628e@roeck-us.net> <20170205034504.GD3407@dragon> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Guenter, On Sat, Feb 04, 2017 at 08:29:27PM -0800, Guenter Roeck wrote: > Yes. One of the problems is that the patch doesn't apply to my tree > (which is based on v4.10-rc3), and it doesn't have a common anchestor, > meaning it is most likely not based on mainline. I would prefer to avoid > conflicts with the arm tree if possible. Understood. You only need to handle patch #1 and #3, and we will sort out MAINTAINERS update separately. Thanks. Shawn From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shawn Guo Subject: Re: [PATCH v9 2/3] MAINTAINERS: add zx2967 watchdog controller driver to ARM ZTE architecture Date: Sun, 5 Feb 2017 12:54:30 +0800 Message-ID: <20170205045429.GE3407@dragon> References: <1486172055-13162-1-git-send-email-baoyou.xie@linaro.org> <1486172055-13162-2-git-send-email-baoyou.xie@linaro.org> <4cba1be6-ee85-7371-ea02-1bf8e7eb628e@roeck-us.net> <20170205034504.GD3407@dragon> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Guenter Roeck Cc: Baoyou Xie , Jun Nie , wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org, Rob Herring , Mark Rutland , Mathieu Poirier , linux-arm Mailing List , linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree , Linux Kernel Mailing List , "xie.baoyou" , chen.chaokai-Th6q7B73Y6EnDS1+zs4M5A@public.gmane.org, wang.qiang01-Th6q7B73Y6EnDS1+zs4M5A@public.gmane.org List-Id: devicetree@vger.kernel.org Hi Guenter, On Sat, Feb 04, 2017 at 08:29:27PM -0800, Guenter Roeck wrote: > Yes. One of the problems is that the patch doesn't apply to my tree > (which is based on v4.10-rc3), and it doesn't have a common anchestor, > meaning it is most likely not based on mainline. I would prefer to avoid > conflicts with the arm tree if possible. Understood. You only need to handle patch #1 and #3, and we will sort out MAINTAINERS update separately. Thanks. Shawn -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: shawnguo@kernel.org (Shawn Guo) Date: Sun, 5 Feb 2017 12:54:30 +0800 Subject: [PATCH v9 2/3] MAINTAINERS: add zx2967 watchdog controller driver to ARM ZTE architecture In-Reply-To: References: <1486172055-13162-1-git-send-email-baoyou.xie@linaro.org> <1486172055-13162-2-git-send-email-baoyou.xie@linaro.org> <4cba1be6-ee85-7371-ea02-1bf8e7eb628e@roeck-us.net> <20170205034504.GD3407@dragon> Message-ID: <20170205045429.GE3407@dragon> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Guenter, On Sat, Feb 04, 2017 at 08:29:27PM -0800, Guenter Roeck wrote: > Yes. One of the problems is that the patch doesn't apply to my tree > (which is based on v4.10-rc3), and it doesn't have a common anchestor, > meaning it is most likely not based on mainline. I would prefer to avoid > conflicts with the arm tree if possible. Understood. You only need to handle patch #1 and #3, and we will sort out MAINTAINERS update separately. Thanks. Shawn