All of lore.kernel.org
 help / color / mirror / Atom feed
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,
	Rob Herring <rob.herring@calxeda.com>,
	Grant Likely <grant.likely@secretlab.ca>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>
Subject: Re: linux-next: manual merge of the usb tree with the devicetree tree
Date: Tue, 25 Jun 2013 08:18:07 -0700	[thread overview]
Message-ID: <20130625151807.GA20244@kroah.com> (raw)
In-Reply-To: <20130625165310.161dafbc62ab505ecbfc3cd3@canb.auug.org.au>

On Tue, Jun 25, 2013 at 04:53:10PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/chipidea/Makefile between commit 8973ba8b325f ("usb:
> chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE") from the
> devicetree tree and commit 8e22978c5708 ("usb: chipidea: drop "13xxx"
> infix") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks,

greg k-h

  reply	other threads:[~2013-06-25 15:17 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-25  6:53 linux-next: manual merge of the usb tree with the devicetree tree Stephen Rothwell
2013-06-25 15:18 ` Greg KH [this message]
2020-05-28  6:22 Stephen Rothwell
2020-05-28 10:49 ` Greg KH
2020-05-28 14:14   ` Rob Herring
2020-05-29  8:26     ` Greg KH
2020-05-29  8:28       ` Greg KH
2020-05-29  8:44         ` Felipe Balbi
2020-05-29 14:04           ` Rob Herring
2020-05-29 14:24             ` Felipe Balbi
2023-10-18  2:13 Stephen Rothwell
2023-10-18  7:56 ` 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=20130625151807.GA20244@kroah.com \
    --to=greg@kroah.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=grant.likely@secretlab.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rob.herring@calxeda.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.