* linux-next: duplicate patch in the tee tree
@ 2024-03-04 23:07 Stephen Rothwell
2024-03-05 6:44 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2024-03-04 23:07 UTC (permalink / raw)
To: Jens Wiklander, Olof Johansson, Arnd Bergmann
Cc: ARM, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: duplicate patch in the tee tree
2024-03-04 23:07 linux-next: duplicate patch in the tee tree Stephen Rothwell
@ 2024-03-05 6:44 ` Arnd Bergmann
2024-03-05 7:30 ` Jens Wiklander
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2024-03-05 6:44 UTC (permalink / raw)
To: Stephen Rothwell, Jens Wiklander, Olof Johansson
Cc: ARM, Linux Kernel Mailing List, linux-next
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: duplicate patch in the tee tree
2024-03-05 6:44 ` Arnd Bergmann
@ 2024-03-05 7:30 ` Jens Wiklander
0 siblings, 0 replies; 3+ messages in thread
From: Jens Wiklander @ 2024-03-05 7:30 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Stephen Rothwell, Olof Johansson, ARM, Linux Kernel Mailing List,
linux-next
On Tue, Mar 5, 2024 at 7:44 AM Arnd Bergmann <arnd@arndb.de> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-05 7:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-04 23:07 linux-next: duplicate patch in the tee tree Stephen Rothwell
2024-03-05 6:44 ` Arnd Bergmann
2024-03-05 7:30 ` Jens Wiklander
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).