linux-next: duplicate patch in the drivers-x86 tree

linux-next: duplicate patch in the drivers-x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]

Hi all,

The following commit is also in the watchdog tree as a different commit
(but the same patch):

  3fce06406c59 ("watchdog: make Siemens Simatic watchdog driver default on platform")

This is commit

  926df9ae133d ("watchdog: make Siemens Simatic watchdog driver default on platform")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the drivers-x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

Hi Stephen,

On Tue, 15 Aug 2023 16:57:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> The following commit is also in the watchdog tree as a different commit
> (but the same patch):
> 
>   3fce06406c59 ("watchdog: make Siemens Simatic watchdog driver default on platform")
> 
> This is commit
> 
>   926df9ae133d ("watchdog: make Siemens Simatic watchdog driver default on platform")

in the watchdog tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the drivers-x86 tree

[Hans de Goede]

Hi,

On 8/15/23 08:58, Stephen Rothwell wrote:
> Hi Stephen,
> 
> On Tue, 15 Aug 2023 16:57:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi all,
>>
>> The following commit is also in the watchdog tree as a different commit
>> (but the same patch):
>>
>>   3fce06406c59 ("watchdog: make Siemens Simatic watchdog driver default on platform")
>>
>> This is commit
>>
>>   926df9ae133d ("watchdog: make Siemens Simatic watchdog driver default on platform")
> 
> in the watchdog tree.

Guenter, IIRC we agreed that I would merge this one through
the pdx86 tree?

specifically through the platform-drivers-x86-simatic-ipc branch:

https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=platform-drivers-x86-simatic-ipc

I even Cc-ed you on the pull-req for the the ib-pdx86-simatic-v6.6-2
tag for which I send a pull-req to Lee because it contains some bits
which are dependencies for some LED driver patches:

https://lore.kernel.org/linux-leds/f16554b9-d34e-4e19-052b-c818ef81d361@redhat.com/

Regards,

Hans

Re: linux-next: duplicate patch in the drivers-x86 tree

[Guenter Roeck]

On Tue, Aug 15, 2023 at 09:59:45AM +0200, Hans de Goede wrote:
> Hi,
> 
> On 8/15/23 08:58, Stephen Rothwell wrote:
> > Hi Stephen,
> > 
> > On Tue, 15 Aug 2023 16:57:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >>
> >> Hi all,
> >>
> >> The following commit is also in the watchdog tree as a different commit
> >> (but the same patch):
> >>
> >>   3fce06406c59 ("watchdog: make Siemens Simatic watchdog driver default on platform")
> >>
> >> This is commit
> >>
> >>   926df9ae133d ("watchdog: make Siemens Simatic watchdog driver default on platform")
> > 
> > in the watchdog tree.
> 
> Guenter, IIRC we agreed that I would merge this one through
> the pdx86 tree?
> 
I thought that applied to the rest of the series. I tagged this patch
with Reviewed-by: which generally means for Wim to pick it up. Ultimately
I don't really care either way. I'll drop the patch from my tree.
Note though that this doesn't mean that Wim will pick up the drop.

Guenter

Re: linux-next: duplicate patch in the drivers-x86 tree

[Wim Van Sebroeck]

Hi all,

> On Tue, Aug 15, 2023 at 09:59:45AM +0200, Hans de Goede wrote:
> > Hi,
> > 
> > On 8/15/23 08:58, Stephen Rothwell wrote:
> > > Hi Stephen,
> > > 
> > > On Tue, 15 Aug 2023 16:57:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >>
> > >> Hi all,
> > >>
> > >> The following commit is also in the watchdog tree as a different commit
> > >> (but the same patch):
> > >>
> > >>   3fce06406c59 ("watchdog: make Siemens Simatic watchdog driver default on platform")
> > >>
> > >> This is commit
> > >>
> > >>   926df9ae133d ("watchdog: make Siemens Simatic watchdog driver default on platform")
> > > 
> > > in the watchdog tree.
> > 
> > Guenter, IIRC we agreed that I would merge this one through
> > the pdx86 tree?
> > 
> I thought that applied to the rest of the series. I tagged this patch
> with Reviewed-by: which generally means for Wim to pick it up. Ultimately
> I don't really care either way. I'll drop the patch from my tree.
> Note though that this doesn't mean that Wim will pick up the drop.

Also dropped in the linux-atchdog-next tree.

Kind regards,
Wim.