2024-03-04 23:07:41

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: duplicate patch in the tee tree

Hi all,

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

1d044941d538 ("tee: make tee_bus_type const")

--
Cheers,
Stephen Rothwell

Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2024-03-05 07:32:45

by Jens Wiklander

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the tee tree

On Tue, Mar 5, 2024 at 7:44 AM Arnd Bergmann <[email protected]> wrote:
>
> On Tue, Mar 5, 2024, at 00:07, Stephen Rothwell wrote:
> > Hi all,
> >
> > The following commit is also in the arm-soc tree as a different commit
> > (but the same patch):
> >
> > 1d044941d538 ("tee: make tee_bus_type const")
>
> Thanks, this was intentional as I ended up cherry-picking the commit
> instead of merging. I expect that Jens will drop this branch now.

Yes, I've reset my next branch now.

Cheers,
Jens

2024-03-05 12:42:09

by Arnd Bergmann

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the tee tree

On Tue, Mar 5, 2024, at 00:07, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
>
> 1d044941d538 ("tee: make tee_bus_type const")

Thanks, this was intentional as I ended up cherry-picking the commit
instead of merging. I expect that Jens will drop this branch now.

Arnd