From: Shawn Guo <shawnguo@kernel.org>
To: Guenter Roeck <linux@roeck-us.net>
Cc: Baoyou Xie <baoyou.xie@linaro.org>, Jun Nie <jun.nie@linaro.org>,
wim@iguana.be, Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
linux-arm Mailing List <linux-arm-kernel@lists.infradead.org>,
linux-watchdog@vger.kernel.org,
devicetree <devicetree@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"xie.baoyou" <xie.baoyou@zte.com.cn>,
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
Date: Sun, 5 Feb 2017 12:54:30 +0800 [thread overview]
Message-ID: <20170205045429.GE3407@dragon> (raw)
In-Reply-To: <e8573429-8082-abc2-be23-4605172cedf1@roeck-us.net>
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
WARNING: multiple messages have this Message-ID (diff)
From: Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
Cc: Baoyou Xie <baoyou.xie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
Jun Nie <jun.nie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org,
Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>,
Mathieu Poirier
<mathieu.poirier-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
linux-arm Mailing List
<linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
Linux Kernel Mailing List
<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
"xie.baoyou" <xie.baoyou-Th6q7B73Y6EnDS1+zs4M5A@public.gmane.org>,
chen.chaokai-Th6q7B73Y6EnDS1+zs4M5A@public.gmane.org,
wang.qiang01-Th6q7B73Y6EnDS1+zs4M5A@public.gmane.org
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 [thread overview]
Message-ID: <20170205045429.GE3407@dragon> (raw)
In-Reply-To: <e8573429-8082-abc2-be23-4605172cedf1-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.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
WARNING: multiple messages have this Message-ID (diff)
From: shawnguo@kernel.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v9 2/3] MAINTAINERS: add zx2967 watchdog controller driver to ARM ZTE architecture
Date: Sun, 5 Feb 2017 12:54:30 +0800 [thread overview]
Message-ID: <20170205045429.GE3407@dragon> (raw)
In-Reply-To: <e8573429-8082-abc2-be23-4605172cedf1@roeck-us.net>
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
next prev parent reply other threads:[~2017-02-05 4:54 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-04 1:34 [PATCH v9 1/3] dt: bindings: add documentation for zx2967 family watchdog controller Baoyou Xie
2017-02-04 1:34 ` Baoyou Xie
2017-02-04 1:34 ` Baoyou Xie
2017-02-04 1:34 ` [PATCH v9 2/3] MAINTAINERS: add zx2967 watchdog controller driver to ARM ZTE architecture Baoyou Xie
2017-02-04 1:34 ` Baoyou Xie
2017-02-04 1:34 ` Baoyou Xie
2017-02-05 0:05 ` Guenter Roeck
2017-02-05 0:05 ` Guenter Roeck
2017-02-05 0:05 ` Guenter Roeck
2017-02-05 2:36 ` Baoyou Xie
2017-02-05 3:45 ` Shawn Guo
2017-02-05 3:45 ` Shawn Guo
2017-02-05 3:57 ` Baoyou Xie
2017-02-05 4:29 ` Guenter Roeck
2017-02-05 4:29 ` Guenter Roeck
2017-02-05 4:29 ` Guenter Roeck
2017-02-05 4:54 ` Shawn Guo [this message]
2017-02-05 4:54 ` Shawn Guo
2017-02-05 4:54 ` Shawn Guo
2017-02-04 1:34 ` [PATCH v9 3/3] watchdog: zx2967: add watchdog controller driver for ZTE's zx2967 family Baoyou Xie
2017-02-04 1:34 ` Baoyou Xie
2017-02-05 0:06 ` Guenter Roeck
2017-02-05 0:06 ` Guenter Roeck
2017-02-05 0:06 ` Guenter Roeck
2017-02-06 17:13 ` Mathieu Poirier
2017-02-06 17:13 ` Mathieu Poirier
2017-02-06 17:13 ` Mathieu Poirier
2017-02-05 0:04 ` [PATCH v9 1/3] dt: bindings: add documentation for zx2967 family watchdog controller Guenter Roeck
2017-02-05 0:04 ` Guenter Roeck
2017-02-05 0:04 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170205045429.GE3407@dragon \
--to=shawnguo@kernel.org \
--cc=baoyou.xie@linaro.org \
--cc=chen.chaokai@zte.com.cn \
--cc=devicetree@vger.kernel.org \
--cc=jun.nie@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=robh+dt@kernel.org \
--cc=wang.qiang01@zte.com.cn \
--cc=wim@iguana.be \
--cc=xie.baoyou@zte.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.