From: Guenter Roeck <linux@roeck-us.net>
To: Romain Perier <romain.perier@gmail.com>
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>,
Rob Herring <robh+dt@kernel.org>, Daniel Palmer <daniel@0x0f.com>,
Mohammed Billoo <mohammed.billoo@gmail.com>,
linux-watchdog@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 2/3] watchdog: Add Mstar MSC313e WDT driver
Date: Fri, 11 Jun 2021 03:34:26 -0700 [thread overview]
Message-ID: <20210611103426.GA3827319@roeck-us.net> (raw)
In-Reply-To: <20210605170441.33667-3-romain.perier@gmail.com>
On Sat, Jun 05, 2021 at 07:04:40PM +0200, Romain Perier wrote:
> From: Daniel Palmer <daniel@0x0f.com>
>
> It adds a driver for the IP block handling the watchdog timer found for
> Mstar MSC313e SoCs and newer.
>
> Signed-off-by: Daniel Palmer <daniel@0x0f.com>
> Co-developed-by: Romain Perier <romain.perier@gmail.com>
> Signed-off-by: Romain Perier <romain.perier@gmail.com>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> MAINTAINERS | 1 +
I tried to apply this patch to my tree, but it doesn't apply because ...
> drivers/watchdog/Kconfig | 12 +++
> drivers/watchdog/Makefile | 1 +
> drivers/watchdog/msc313e_wdt.c | 166 +++++++++++++++++++++++++++++++++
> 4 files changed, 180 insertions(+)
> create mode 100644 drivers/watchdog/msc313e_wdt.c
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index a0f37adb9e64..fcc10c57298c 100644
a0f37adb9e64 is not an upstream SHA and there is a conflict. Please resend
the series based on some upstream tag.
Guenter
next prev parent reply other threads:[~2021-06-11 10:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-05 17:04 [PATCH v3 0/3] Add watchdog for Mstar SoCs Romain Perier
2021-06-05 17:04 ` [PATCH v3 1/3] dt-bindings: watchdog: Add Mstar MSC313e WDT devicetree bindings documentation Romain Perier
2021-06-10 16:57 ` Rob Herring
2021-06-05 17:04 ` [PATCH v3 2/3] watchdog: Add Mstar MSC313e WDT driver Romain Perier
2021-06-05 20:26 ` Guenter Roeck
2021-06-11 10:34 ` Guenter Roeck [this message]
2021-06-11 14:35 ` Romain Perier
2021-06-11 15:13 ` Guenter Roeck
2021-06-05 17:04 ` [PATCH v3 3/3] ARM: dts: mstar: Add watchdog device_node definition Romain Perier
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=20210611103426.GA3827319@roeck-us.net \
--to=linux@roeck-us.net \
--cc=daniel@0x0f.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=mohammed.billoo@gmail.com \
--cc=robh+dt@kernel.org \
--cc=romain.perier@gmail.com \
--cc=wim@linux-watchdog.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).