From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Mathieu Poirier <mathieu.poirier@linaro.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the arm-soc tree
Date: Fri, 21 Nov 2014 15:14:12 -0800 [thread overview]
Message-ID: <20141121231411.GW7046@atomide.com> (raw)
In-Reply-To: <20141121172412.4caf89cc@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [141120 22:26]:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in
> arch/arm/mach-omap2/Kconfig between commit 9e1e632c4846 ("ARM: OMAP2+:
> Drop board file for ti8168evm") from the arm-soc tree and commit
> 184901a06a36 ("ARM: removing support for etb/etm in
> "arch/arm/kernel/"") from the char-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks right to me thanks.
Tony
> diff --cc arch/arm/mach-omap2/Kconfig
> index 27ec8923ddf6,06020fe77e57..000000000000
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@@ -276,14 -282,16 +276,6 @@@ config MACH_SBC353
> default y
> select OMAP_PACKAGE_CUS
>
> - config OMAP3_EMU
> - bool "OMAP3 debugging peripherals"
> - depends on ARCH_OMAP3
> - select ARM_AMBA
> - select OC_ETM
> - help
> - Say Y here to enable debugging hardware of omap3
> -config MACH_TI8168EVM
> - bool "TI8168 Evaluation Module"
> - depends on SOC_TI81XX
> - default y
> -
> -config MACH_TI8148EVM
> - bool "TI8148 Evaluation Module"
> - depends on SOC_TI81XX
> - default y
> --
> config OMAP3_SDRC_AC_TIMING
> bool "Enable SDRC AC timing register changes"
> depends on ARCH_OMAP3
next prev parent reply other threads:[~2014-11-21 23:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-21 6:24 linux-next: manual merge of the char-misc tree with the arm-soc tree Stephen Rothwell
2014-11-21 23:14 ` Tony Lindgren [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-04-30 7:40 Stephen Rothwell
2019-04-30 8:14 ` Greg KH
2019-05-08 5:01 ` Stephen Rothwell
2022-03-15 5:51 Stephen Rothwell
2022-03-15 7:35 ` Greg KH
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=20141121231411.GW7046@atomide.com \
--to=tony@atomide.com \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/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).