From: Darren Hart <dvhart@infradead.org>
To: Vadim Pasternak <vadimp@mellanox.com>
Cc: Guenter Roeck <linux@roeck-us.net>,
Michael Shych <michaelsh@mellanox.com>,
"wim@linux-watchdog.org" <wim@linux-watchdog.org>,
"andy@infradead.org" <andy@infradead.org>,
"linux-watchdog@vger.kernel.org" <linux-watchdog@vger.kernel.org>,
"platform-driver-x86@vger.kernel.org"
<platform-driver-x86@vger.kernel.org>
Subject: Re: [PATCH v4 2/3] watchdog: mlx-wdt: introduce a watchdog driver for Mellanox systems.
Date: Wed, 6 Mar 2019 22:39:40 -0800 [thread overview]
Message-ID: <20190307063940.GH44339@wrath> (raw)
In-Reply-To: <AM6PR05MB52241830B0F86C68BC78F0D2A2790@AM6PR05MB5224.eurprd05.prod.outlook.com>
On Sun, Feb 24, 2019 at 06:01:46PM +0000, Vadim Pasternak wrote:
...
> > > Who should take it to the next, watchdog or platform mainatainer?
> > >
> > Good question. For now I added it to my watchdog-next branch. But then strictly
> > speaking (and as far as I know) we don't have an Ack from the platform
> > maintainer, so maybe I should not have done that. Maybe we should wait for
> > the platform part to be merged by the platform maintainer. Thoughts, anyone ?
> >
>
> Right.
>
> Darren, Andy,
> In case you are OK with the changes in mlxreg.h from
> [PATCH v4 1/3] platform_data/mlxreg: additions for Mellanox watchdog driver.
> from this patchset, could you please ack?
I don't have any problem with the change as proposed. We do appear to
have a conflict in next now though. So we either have to provide merge
instructions to Linus, or rebase the wdt next branch and have us pull it
in.
I'd prefer to leave things alone, keep the series together in the wdt
next tree, and just provide Linus with an explanation of the merge
conflict (standard operating procedure).
So, a bit late, but for the record, for the mlxreg.h changes:
Acked-by: Darren Hart (VMware) <dvhart@infradead.org>
--
Darren Hart
VMware Open Source Technology Center
next prev parent reply other threads:[~2019-03-07 6:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-20 9:34 [PATCH v4 0/3] introduce watchdog driver for Mellanox systems michaelsh
2019-02-20 9:34 ` [PATCH v4 1/3] platform_data/mlxreg: additions for Mellanox watchdog driver michaelsh
2019-02-23 17:12 ` Guenter Roeck
2019-02-20 9:34 ` [PATCH v4 2/3] watchdog: mlx-wdt: introduce a watchdog driver for Mellanox systems michaelsh
2019-02-23 17:12 ` Guenter Roeck
2019-02-24 11:36 ` Vadim Pasternak
2019-02-24 16:39 ` Guenter Roeck
2019-02-24 18:01 ` Vadim Pasternak
2019-03-07 6:39 ` Darren Hart [this message]
2019-02-20 9:34 ` [PATCH v4 3/3] Documentation/watchdog: Add documentation mlx-wdt driver michaelsh
2019-02-23 17:13 ` Guenter Roeck
2019-02-24 17:26 ` Michael Shych
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=20190307063940.GH44339@wrath \
--to=dvhart@infradead.org \
--cc=andy@infradead.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=michaelsh@mellanox.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=vadimp@mellanox.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