* linux-next: duplicate patch in the imx-mxs tree
@ 2023-01-27 0:08 Stephen Rothwell
2023-01-27 7:58 ` Shawn Guo
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2023-01-27 0:08 UTC (permalink / raw)
To: Shawn Guo, Olof Johansson, Arnd Bergmann, ARM
Cc: Mark Brown, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1.1: Type: text/plain, Size: 326 bytes --]
Hi all,
The following commit is also in arm-soc tree as a different commit
(but the same patch):
b82765d04e37 ("ARM: multi_v7_defconfig: Enable wm896x audio CODECs")
This is commit
74ab23d5a7fc ("ARM: multi_v7_defconfig: Enable wm896x audio CODECs")
in the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: duplicate patch in the imx-mxs tree
2023-01-27 0:08 Stephen Rothwell
@ 2023-01-27 7:58 ` Shawn Guo
0 siblings, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2023-01-27 7:58 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, ARM, Mark Brown,
Linux Kernel Mailing List, Linux Next Mailing List
On Fri, Jan 27, 2023 at 11:08:33AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in arm-soc tree as a different commit
> (but the same patch):
>
> b82765d04e37 ("ARM: multi_v7_defconfig: Enable wm896x audio CODECs")
Dropped it from imx-mxs tree.
Shawn
>
> This is commit
>
> 74ab23d5a7fc ("ARM: multi_v7_defconfig: Enable wm896x audio CODECs")
>
> in the arm-soc tree.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: duplicate patch in the imx-mxs tree
@ 2024-07-10 1:53 Stephen Rothwell
2024-07-10 2:31 ` Shawn Guo
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2024-07-10 1:53 UTC (permalink / raw)
To: Shawn Guo, Olof Johansson, Arnd Bergmann
Cc: Fabio Estevam, ARM, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
Hi all,
The following commit is also in the arm-soc tree as a different commit
(but the same patch):
3898bc187cde ("arm64: defconfig: Enable the IWLWIFI driver")
This is commit
465830ad2534 ("arm64: defconfig: Enable the IWLWIFI driver")
in the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: duplicate patch in the imx-mxs tree
2024-07-10 1:53 linux-next: duplicate patch in the imx-mxs tree Stephen Rothwell
@ 2024-07-10 2:31 ` Shawn Guo
0 siblings, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2024-07-10 2:31 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Shawn Guo, Olof Johansson, Arnd Bergmann, Fabio Estevam, ARM,
Linux Kernel Mailing List, Linux Next Mailing List
On Wed, Jul 10, 2024 at 11:53:19AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
>
> 3898bc187cde ("arm64: defconfig: Enable the IWLWIFI driver")
>
> This is commit
>
> 465830ad2534 ("arm64: defconfig: Enable the IWLWIFI driver")
>
> in the arm-soc tree.
Thanks for reporting! It happened because of that my for-next branch is
outdated. I just updated it.
Shawn
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-10 2:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-10 1:53 linux-next: duplicate patch in the imx-mxs tree Stephen Rothwell
2024-07-10 2:31 ` Shawn Guo
-- strict thread matches above, loose matches on Subject: below --
2023-01-27 0:08 Stephen Rothwell
2023-01-27 7:58 ` Shawn Guo
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).