Re: [PATCH v3 2/3] watchdog: Add Mstar MSC313e WDT driver
From: Guenter Roeck <linux@roeck-us.net>
Date: 2021-06-11 10:34:50
Also in:
linux-arm-kernel, linux-watchdog, lkml
On Sat, Jun 05, 2021 at 07:04:40PM +0200, Romain Perier wrote:
From: Daniel Palmer <redacted> It adds a driver for the IP block handling the watchdog timer found for Mstar MSC313e SoCs and newer. Signed-off-by: Daniel Palmer <redacted> 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 ...
quoted hunk ↗ jump to hunk
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.cdiff --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