From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Takashi Iwai <tiwai@suse.de>, Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>
Cc: "Olof Johansson" <olof@lixom.net>,
"Arnd Bergmann" <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>,
"Kuninori Morimoto" <kuninori.morimoto.gx@renesas.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Subject: Re: linux-next: manual merge of the sound tree with the arm-soc tree
Date: Wed, 22 Feb 2023 09:12:50 +1100 [thread overview]
Message-ID: <20230222091250.2593add3@canb.auug.org.au> (raw)
In-Reply-To: <20230221092759.34d35668@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 1723 bytes --]
Hi all,
On Tue, 21 Feb 2023 09:27:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 17 Feb 2023 11:23:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the sound tree got conflicts in:
> >
> > sound/soc/cirrus/ep93xx-ac97.c
> > sound/soc/pxa/e740_wm9705.c
> > sound/soc/pxa/e750_wm9705.c
> > sound/soc/pxa/e800_wm9712.c
> > sound/soc/ti/davinci-vcif.c
> >
> > between commits:
> >
> > 2b45e1fa9398 ("ASoC: remove unused ep93xx files")
> > efe81e9a9273 ("ASoC: remove unused davinci support")
> > b401d1fd8053 ("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")
> > 0e478b88b257 ("ASoC: cirrus: use helper function")
> > 2abde57fb82b ("ASoC: ti: use helper function")
> >
> > from the sound 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.
>
> This is now a conflict between the arm-soc tree and the
> sound-asoc-fixes tree.
This is now a conflict between the sound-asoc-fixes tree and Linus'
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
next prev parent reply other threads:[~2023-02-21 22:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-17 0:23 linux-next: manual merge of the sound tree with the arm-soc tree Stephen Rothwell
2023-02-20 22:27 ` Stephen Rothwell
2023-02-21 22:12 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-02-25 1:36 Stephen Rothwell
2019-02-25 9:19 ` Arnd Bergmann
2019-02-25 11:14 ` Takashi Iwai
2019-02-25 11:24 ` Sameer Pujar
2019-02-25 13:38 ` Arnd Bergmann
2019-02-25 16:43 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230222091250.2593add3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=tiwai@suse.de \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).