From: Tony Lindgren <tony@atomide•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
ARM <linux-arm-kernel@lists•infradead.org>,
Juerg Haefliger <juerg.haefliger@canonical•com>,
Juerg Haefliger <juergh@canonical•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the omap tree with the arm-soc tree
Date: Thu, 19 Jan 2023 12:11:33 +0200 [thread overview]
Message-ID: <Y8kXVekfGHEcPvWg@atomide.com> (raw)
In-Reply-To: <20230110095041.0d6311d2@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> [230109 22:57]:
> Hi all,
>
> Today's linux-next merge of the omap tree got a conflict in:
>
> arch/arm/mach-omap1/Kconfig
>
> between commit:
>
> 67d3928c3df5 ("ARM: omap1: remove unused board files")
>
> from the arm-soc tree and commit:
>
> 609c1fabc7c5 ("ARM: omap1: Kconfig: Fix indentation")
>
> from the omap tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks, I just dropped "ARM: omap1: remove unused board files" to
simplify things.
Juerg, care to update and resend in a few weeks after v6.3-rc1
after the omap1 clean-up patches are merged?
Regards,
Tony
next prev parent reply other threads:[~2023-01-19 10:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-09 22:50 linux-next: manual merge of the omap tree with the arm-soc tree Stephen Rothwell
2023-01-19 10:11 ` Tony Lindgren [this message]
2023-03-15 9:11 ` [PATCH v2] ARM: omap1: Kconfig: Fix indentation Juerg Haefliger
2023-03-27 6:55 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2015-01-20 0:09 linux-next: manual merge of the omap tree with the arm-soc tree Stephen Rothwell
2015-01-20 17:10 ` Tony Lindgren
2015-01-20 18:24 ` Olof Johansson
2015-01-20 18:40 ` Tony Lindgren
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=Y8kXVekfGHEcPvWg@atomide.com \
--to=tony@atomide$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=juerg.haefliger@canonical$(echo .)com \
--cc=juergh@canonical$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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