From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Srinivas Pandruvada <srinivas.pandruvada@linux•intel.com>,
Jacob Pan <jacob.jun.pan@linux•intel.com>,
"Rafael J. Wysocki" <rjw@rjwysocki•net>,
Kishon Vijay Abraham I <kishon@ti•com>
Subject: Re: linux-next: manual merge of the usb tree with the tree
Date: Thu, 31 Oct 2013 15:16:28 -0700 [thread overview]
Message-ID: <20131031221628.GA3595@kroah.com> (raw)
In-Reply-To: <20131028230152.46d44ec81ac368fa00191225@canb.auug.org.au>
On Mon, Oct 28, 2013 at 11:01:52PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/Kconfig between commit 12cc4b3827f8 ("PowerCap: Add to drivers
> Kconfig and Makefile") from the pm tree and commit ff764963479a
> ("drivers: phy: add generic PHY framework") from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks fine to me, thanks.
greg k-h
next prev parent reply other threads:[~2013-10-31 22:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-28 12:01 linux-next: manual merge of the usb tree with the tree Stephen Rothwell
2013-10-31 22:16 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-03-12 1:05 Mark Brown
2014-03-12 1:18 Mark Brown
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=20131031221628.GA3595@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=jacob.jun.pan@linux$(echo .)intel.com \
--cc=kishon@ti$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@rjwysocki$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=srinivas.pandruvada@linux$(echo .)intel.com \
/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