Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Sender: Guenter Roeck <groeck7@gmail.com>
Date:   Fri, 11 Jun 2021 08:13:22 -0700
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 <linux-arm-kernel@lists.infradead.org>,
        devicetree <devicetree@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3 2/3] watchdog: Add Mstar MSC313e WDT driver
Message-ID: <20210611151322.GA4137959@roeck-us.net>
References: <20210605170441.33667-1-romain.perier@gmail.com>
 <20210605170441.33667-3-romain.perier@gmail.com>
 <20210611103426.GA3827319@roeck-us.net>
 <CABgxDoJhCiBoyJW3WOF9Jac9QcAfDxE5wND6gg1tvqd74hd+NQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CABgxDoJhCiBoyJW3WOF9Jac9QcAfDxE5wND6gg1tvqd74hd+NQ@mail.gmail.com>
Precedence: bulk

On Fri, Jun 11, 2021 at 04:35:33PM +0200, Romain Perier wrote:
> Le ven. 11 juin 2021 ? 12:34, Guenter Roeck <linux@roeck-us.net> a ?crit :
> >
> > 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
> 
> Arf, I will rebase and resend then, my bad. It is okay if I rebase the
> series onto https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
> , branch watchdog-next ?
> 
Please just base it on the latest upstream release tag (currently v5.13-rc5).
Git can handle it as long as the base tag is stable.

Thanks,
Guenter