* linux-next: please clean up the usb-chipidea-fixes/next trees
@ 2022-04-06 1:32 Stephen Rothwell
2022-04-09 1:47 ` Peter Chen
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2022-04-06 1:32 UTC (permalink / raw)
To: Peter Chen; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 335 bytes --]
Hi all,
[Try again to an address that may work ...]
The usb-chipidea-fixes and -next trees have not been updated since Oct,
2021 and the -fixes tree is generating a conflict when merged. Please
clean them it up WRT Linus' tree as the only patches in them have been
merged as other commits.
--
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: please clean up the usb-chipidea-fixes/next trees
2022-04-06 1:32 linux-next: please clean up the usb-chipidea-fixes/next trees Stephen Rothwell
@ 2022-04-09 1:47 ` Peter Chen
2022-04-09 5:38 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Peter Chen @ 2022-04-09 1:47 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
On 22-04-06 11:32:42, Stephen Rothwell wrote:
> Hi all,
>
> [Try again to an address that may work ...]
>
> The usb-chipidea-fixes and -next trees have not been updated since Oct,
> 2021 and the -fixes tree is generating a conflict when merged. Please
> clean them it up WRT Linus' tree as the only patches in them have been
> merged as other commits.
>
Hi Stephen,
Sorry about that. I have a little busy these years, the USB patches
which went to my tree will go to the Greg's USB tree directly, I only
review these patches now. Would you please also delete my tree from
your merge list? Thanks.
--
Thanks,
Peter Chen
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: please clean up the usb-chipidea-fixes/next trees
2022-04-09 1:47 ` Peter Chen
@ 2022-04-09 5:38 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2022-04-09 5:38 UTC (permalink / raw)
To: Peter Chen; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 709 bytes --]
Hi Peter,
On Sat, 9 Apr 2022 09:47:02 +0800 Peter Chen <peter.chen@kernel.org> wrote:
>
> On 22-04-06 11:32:42, Stephen Rothwell wrote:
> >
> > The usb-chipidea-fixes and -next trees have not been updated since Oct,
> > 2021 and the -fixes tree is generating a conflict when merged. Please
> > clean them it up WRT Linus' tree as the only patches in them have been
> > merged as other commits.
>
> Sorry about that. I have a little busy these years, the USB patches
> which went to my tree will go to the Greg's USB tree directly, I only
> review these patches now. Would you please also delete my tree from
> your merge list? Thanks.
No worries, done.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-09 5:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-06 1:32 linux-next: please clean up the usb-chipidea-fixes/next trees Stephen Rothwell
2022-04-09 1:47 ` Peter Chen
2022-04-09 5:38 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox