mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Uwe Kleine-König" <u.kleine-koenig@baylibre.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Takashi Iwai <tiwai@suse.de>, Olof Johansson <olof@lixom.net>,
	 Arnd Bergmann <arnd@arndb.de>,
	Alexander Sverdlin <alexander.sverdlin@gmail.com>,
	 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	 ARM <linux-arm-kernel@lists.infradead.org>,
	Mark Brown <broonie@kernel.org>,
	 Nikita Shubin <nikita.shubin@maquefel.me>
Subject: Re: linux-next: manual merge of the sound tree with the arm-soc tree
Date: Mon, 16 Sep 2024 10:42:25 +0200	[thread overview]
Message-ID: <rn7zribry4zpacbqynr5ljdlpj6vjs37nn2cs2lffoee3ehilx@kfthit56sgit> (raw)
In-Reply-To: <20240916145800.743302ec@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 631 bytes --]

Hello Stephen,

On Mon, Sep 16, 2024 at 02:58:00PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the sound tree got a conflict in:
> 
>   sound/soc/cirrus/edb93xx.c
> 
> between commit:
> 
>   7a9a9110d765 ("ASoC: cirrus: edb93xx: Delete driver")
> 
> from the arm-soc tree and commit:
> 
>   130af75b5c05 ("ASoC: Switch back to struct platform_driver::remove()")
> 
> from the sound tree.
> 
> I fixed it up (I removed the file) and can carry the fix as
> necessary.

JFTR: I didn't check your tree, but that sounds like the right
resolution.

Thanks for your effort to run linux-next!
Uwe

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2024-09-16  8:42 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-16  4:58 Stephen Rothwell
2024-09-16  8:42 ` Uwe Kleine-König [this message]
2024-09-17 23:57 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2023-02-17  0:23 Stephen Rothwell
2023-02-20 22:27 ` Stephen Rothwell
2023-02-21 22:12   ` Stephen Rothwell
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
2011-10-11  4:43 Stephen Rothwell
2011-10-11  6:15 ` Ujfalusi, Peter

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=rn7zribry4zpacbqynr5ljdlpj6vjs37nn2cs2lffoee3ehilx@kfthit56sgit \
    --to=u.kleine-koenig@baylibre.com \
    --cc=alexander.sverdlin@gmail.com \
    --cc=arnd@arndb.de \
    --cc=broonie@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=nikita.shubin@maquefel.me \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    --cc=tiwai@suse.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

all inboxes | Powered by JetHome®