Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree

2019-03-06 Thread Darren Hart
On Wed, Mar 06, 2019 at 09:27:01PM -0800, Darren Hart wrote: > On Mon, Mar 04, 2019 at 02:37:35PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > > > include/linux/platform_data/mlxreg.h > > > > between commit: > > > >

Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree

2019-03-06 Thread Darren Hart
On Mon, Mar 04, 2019 at 02:37:35PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > include/linux/platform_data/mlxreg.h > > between commit: > > 9f03161a1bd8 ("platform_data/mlxreg: additions for Mellanox watchdog > driver

linux-next: manual merge of the drivers-x86 tree with the watchdog tree

2019-03-03 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drivers-x86 tree got a conflict in: include/linux/platform_data/mlxreg.h between commit: 9f03161a1bd8 ("platform_data/mlxreg: additions for Mellanox watchdog driver.") from the watchdog tree and commit: 9b28aa1d0eae ("platform_data/mlxreg: Documen

Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree

2017-05-03 Thread Wim Van Sebroeck
Hi All, > On Tue, May 02, 2017 at 02:58:22PM -0700, Guenter Roeck wrote: > > On Tue, May 02, 2017 at 02:30:46PM -0700, Darren Hart wrote: > > > On Tue, May 02, 2017 at 11:57:18PM +0300, Andy Shevchenko wrote: > > > > On Tue, May 2, 2017 at 11:21 PM, Darren Hart > > > > wrote: > > > > > On Tue, M

Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree

2017-05-03 Thread Andy Shevchenko
On Wed, May 3, 2017 at 5:24 PM, Wim Van Sebroeck wrote: >> On Tue, May 02, 2017 at 02:58:22PM -0700, Guenter Roeck wrote: >> > On Tue, May 02, 2017 at 02:30:46PM -0700, Darren Hart wrote: >> > On a side note, it appears that I tagged "watchdog: iTCO_wdt: cleanup >> > set/unset no_reboot_bit funct

Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree

2017-05-02 Thread Darren Hart
On Tue, May 02, 2017 at 02:58:22PM -0700, Guenter Roeck wrote: > On Tue, May 02, 2017 at 02:30:46PM -0700, Darren Hart wrote: > > On Tue, May 02, 2017 at 11:57:18PM +0300, Andy Shevchenko wrote: > > > On Tue, May 2, 2017 at 11:21 PM, Darren Hart wrote: > > > > On Tue, May 02, 2017 at 12:12:17PM -0

Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree

2017-05-02 Thread Guenter Roeck
On Tue, May 02, 2017 at 02:30:46PM -0700, Darren Hart wrote: > On Tue, May 02, 2017 at 11:57:18PM +0300, Andy Shevchenko wrote: > > On Tue, May 2, 2017 at 11:21 PM, Darren Hart wrote: > > > On Tue, May 02, 2017 at 12:12:17PM -0700, Guenter Roeck wrote: > > >> On Tue, May 02, 2017 at 11:09:40AM -07

Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree

2017-05-02 Thread Darren Hart
On Tue, May 02, 2017 at 11:57:18PM +0300, Andy Shevchenko wrote: > On Tue, May 2, 2017 at 11:21 PM, Darren Hart wrote: > > On Tue, May 02, 2017 at 12:12:17PM -0700, Guenter Roeck wrote: > >> On Tue, May 02, 2017 at 11:09:40AM -0700, Darren Hart wrote: > >> > On Tue, May 02, 2017 at 02:04:03PM +100

Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree

2017-05-02 Thread Andy Shevchenko
On Tue, May 2, 2017 at 11:21 PM, Darren Hart wrote: > On Tue, May 02, 2017 at 12:12:17PM -0700, Guenter Roeck wrote: >> On Tue, May 02, 2017 at 11:09:40AM -0700, Darren Hart wrote: >> > On Tue, May 02, 2017 at 02:04:03PM +1000, Stephen Rothwell wrote: > From my perspective, the most direct soluti

Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree

2017-05-02 Thread Darren Hart
On Tue, May 02, 2017 at 12:12:17PM -0700, Guenter Roeck wrote: > On Tue, May 02, 2017 at 11:09:40AM -0700, Darren Hart wrote: > > On Tue, May 02, 2017 at 02:04:03PM +1000, Stephen Rothwell wrote: > > > Hi all, > > > > > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > > >

Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree

2017-05-02 Thread Guenter Roeck
On Tue, May 02, 2017 at 11:09:40AM -0700, Darren Hart wrote: > On Tue, May 02, 2017 at 02:04:03PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > > > drivers/watchdog/iTCO_wdt.c > > > > between commit: > > > > 38a700

Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree

2017-05-02 Thread Darren Hart
On Tue, May 02, 2017 at 02:04:03PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > drivers/watchdog/iTCO_wdt.c > > between commit: > > 38a700fa1df9 ("watchdog: iTCO_wdt: cleanup set/unset no_reboot_bit > functions") > (wh

linux-next: manual merge of the drivers-x86 tree with the watchdog tree

2017-05-01 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drivers-x86 tree got a conflict in: drivers/watchdog/iTCO_wdt.c between commit: 38a700fa1df9 ("watchdog: iTCO_wdt: cleanup set/unset no_reboot_bit functions") (which also appears in the drivers-x86 tree as commit f583a884afec) from the watchdog tree