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@xxxxxxxxxxxxx> -- Darren Hart VMware Open Source Technology Center
