From: Thierry Reding <thierry.reding@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sascha Hauer <s.hauer@pengutronix.de>,
Paul Bolle <pebolle@tiscali.nl>
Subject: Re: linux-next: manual merge of the pwm tree with the usb tree
Date: Thu, 27 Feb 2014 13:10:49 +0100 [thread overview]
Message-ID: <20140227121048.GC21422@ulmo.nvidia.com> (raw)
In-Reply-To: <20140227155613.16a690cf5423d4889d887273@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 989 bytes --]
On Thu, Feb 27, 2014 at 03:56:13PM +1100, Stephen Rothwell wrote:
> Hi Thierry,
>
> Today's linux-next merge of the pwm tree got a conflict in
> arch/arm/Kconfig between commit f6723b569a67 ("usb: host: remove selects
> of USB_ARCH_HAS_?HCI") from the usb tree and commit 557fe99d9d49 ("pwm:
> Remove obsolete HAVE_PWM Kconfig symbol") from the pwm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/Kconfig
> index c85745d2d20a,cc6ce44064a2..000000000000
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@@ -628,7 -629,7 +625,6 @@@ config ARCH_LPC32X
> select CPU_ARM926T
> select GENERIC_CLOCKEVENTS
> select HAVE_IDE
> - select HAVE_PWM
> - select USB_ARCH_HAS_OHCI
> select USE_OF
> help
> Support for the NXP LPC32XX family of processors
Looks good to me.
Thanks,
Thierry
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2014-02-27 12:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-27 4:56 linux-next: manual merge of the pwm tree with the usb tree Stephen Rothwell
2014-02-27 12:10 ` Thierry Reding [this message]
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=20140227121048.GC21422@ulmo.nvidia.com \
--to=thierry.reding@gmail.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pebolle@tiscali.nl \
--cc=s.hauer@pengutronix.de \
--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).