From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Kishon Vijay Abraham I <kishon@ti.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the usb tree
Date: Tue, 22 Oct 2013 11:02:47 -0700 [thread overview]
Message-ID: <5266BDC7.2050701@linux.intel.com> (raw)
In-Reply-To: <1382454517-4074-4-git-send-email-treding@nvidia.com>
On 10/22/2013 08:08 AM, Thierry Reding wrote:
> Today's linux-next merge of the usb tree got a conflict in
>
> drivers/Kconfig
>
> caused by commits ff76496 (drivers: phy: add generic PHY framework) and
> 12cc4b38 (PowerCap: Add to drivers Kconfig and Makefile).
>
> I fixed it up (see below). Please verify that the resolution look good.
>
> Thanks,
> Thierry
> ---
> diff --cc drivers/Kconfig
> index 969e987,8f45144..97536a2
> --- a/drivers/Kconfig
> +++ b/drivers/Kconfig
> @@@ -166,6 -166,6 +166,8 @@@ source "drivers/reset/Kconfig
>
> source "drivers/fmc/Kconfig"
>
> +source "drivers/powercap/Kconfig"
> +
Look OK.
> + source "drivers/phy/Kconfig"
> +
> endmenu
Thanks,
Srinivas
next prev parent reply other threads:[~2013-10-22 18:02 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-22 15:08 linux-next: Tree for Oct 22 Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the arm tree Thierry Reding
2013-10-25 15:20 ` Dmitry Kravkov
2013-10-22 15:08 ` linux-next: manual merge of the ipsec-next tere Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the usb tree Thierry Reding
2013-10-22 18:02 ` Srinivas Pandruvada [this message]
2013-10-22 19:24 ` linux-next: Tree for Oct 22 Guenter Roeck
2013-10-22 22:04 ` linux-next: Tree for Oct 22 (xilinx_uartps) Randy Dunlap
2013-10-23 7:04 ` Greg Kroah-Hartman
2013-10-22 22:36 ` linux-next: Tree for Oct 22 (crypto/asymmetric_keys/rsa.c) Randy Dunlap
-- strict thread matches above, loose matches on Subject: below --
2008-11-10 1:06 linux-next: manual merge of the usb tree Stephen Rothwell
2008-11-10 1:40 ` Greg KH
2008-10-14 3:53 Stephen Rothwell
2008-10-14 3:47 Stephen Rothwell
2008-10-14 3:37 Stephen Rothwell
2008-10-14 3:31 Stephen Rothwell
2008-10-14 5:44 ` Alexey Klimov
2008-10-14 3:27 Stephen Rothwell
2008-07-17 0:54 Stephen Rothwell
2008-07-17 7:04 ` Greg KH
2008-07-16 2:02 Stephen Rothwell
2008-07-16 2:30 ` Greg KH
2008-07-16 7:06 ` Jaswinder Singh
2008-07-16 7:13 ` Stephen Rothwell
2008-07-16 7:20 ` Jaswinder Singh
2008-07-16 7:45 ` Stephen Rothwell
2008-07-16 7:49 ` Jaswinder Singh
2008-07-16 7:58 ` Stephen Rothwell
2008-07-07 3:09 Stephen Rothwell
2008-07-07 14:09 ` Alan Stern
2008-07-07 16:09 ` Stephen Rothwell
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=5266BDC7.2050701@linux.intel.com \
--to=srinivas.pandruvada@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=thierry.reding@gmail.com \
/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).