* linux-next: manual merge of the sound-asoc tree with the arm-soc tree
@ 2023-01-10 0:17 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2023-01-10 0:17 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Olof Johansson, Arnd Bergmann
Cc: ARM, Linux Kernel Mailing List, Linux Next Mailing List,
Uwe Kleine-König
[-- Attachment #1: Type: text/plain, Size: 988 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got conflicts in:
sound/soc/pxa/e740_wm9705.c
sound/soc/pxa/e750_wm9705.c
sound/soc/pxa/e800_wm9712.c
between commit:
64725fa9ce08 ("ASoC: pxa: remove unused board support")
from the arm-soc tree and commits:
f2211ac36ab0 ("ASoC: pxa: e740_wm9705: Drop empty platform remove function")
4ed923e8076b ("ASoC: pxa: e750_wm9705: Drop empty platform remove function")
394296eee2c2 ("ASoC: pxa: e800_wm9712: Drop empty platform remove function")
from the sound-asoc tree.
I fixed it up (I just removed the files) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the sound-asoc tree with the arm-soc tree
@ 2023-01-31 23:59 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2023-01-31 23:59 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Olof Johansson, Arnd Bergmann
Cc: ARM, Kuninori Morimoto, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 727 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in:
sound/soc/ti/davinci-vcif.c
between commit:
efe81e9a9273 ("ASoC: remove unused davinci support")
from the arm-soc tree and commit:
2abde57fb82b ("ASoC: ti: use helper function")
from the sound-asoc tree.
I fixed it up (I removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the sound-asoc tree with the arm-soc tree
@ 2023-01-31 23:57 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2023-01-31 23:57 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Olof Johansson, Arnd Bergmann
Cc: ARM, Kuninori Morimoto, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 736 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in:
sound/soc/cirrus/ep93xx-ac97.c
between commit:
2b45e1fa9398 ("ASoC: remove unused ep93xx files")
from the arm-soc tree and commit:
0e478b88b257 ("ASoC: cirrus: use helper function")
from the sound-asoc tree.
I fixed it up (I just removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
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:[~2023-01-31 23:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-10 0:17 linux-next: manual merge of the sound-asoc tree with the arm-soc tree Stephen Rothwell
2023-01-31 23:57 Stephen Rothwell
2023-01-31 23:59 Stephen Rothwell
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).