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,
	Andiry Xu <andiry.xu@amd.com>, Alex He <alex.he@amd.com>
Subject: Re: linux-next: manual merge of the usb tree with Linus' tree
Date: Thu, 17 Feb 2011 10:04:56 -0800	[thread overview]
Message-ID: <20110217180456.GA17077@kroah.com> (raw)
In-Reply-To: <20110207150802.4869bd47.sfr@canb.auug.org.au>

On Mon, Feb 07, 2011 at 03:08:02PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-pci.c between commit
> baab93afc2844b68d57b0dcca5e1d34c5d7cf411 ("USB: EHCI: ASPM quirk of ISOC
> on AMD Hudson") from Linus' tree and commit
> b7d5b439b7a40dd0a0202fe1c118615a3fcc3b25 ("USB host: Move AMD PLL quirk
> to pci-quirks.c") from the usb tree.
> 
> I just use the version from the usb tree, but this may need fixing up in
> pci-quirks.c.

I have reverted the patch in the usb-next tree, and merged with Linus's
tree, so the usb-next tree should be all good now.

Andriy, can you resend me a new version of this patch that I can apply,
as I couldn't resolve the merge issues, they were just too great.

thanks,

greg k-h

  parent reply	other threads:[~2011-02-17 18:06 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-07  4:08 linux-next: manual merge of the usb tree with Linus' tree Stephen Rothwell
2011-02-09  2:31 ` Xu, Andiry
2011-02-09  2:31   ` Xu, Andiry
2011-02-09  5:42 ` Xu, Andiry
2011-02-09  5:42   ` Xu, Andiry
2011-02-17 18:04 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-01-21  4:07 Stephen Rothwell
2013-01-21 21:02 ` Greg KH
2013-01-25 20:52   ` Greg KH
2010-12-16  3:01 Stephen Rothwell
2010-12-16  3:08 ` Greg KH
2010-12-16  8:05   ` Felipe Balbi
2010-12-16  8:45     ` Felipe Balbi
2010-12-16 15:52       ` Greg KH
2010-12-16 15:55         ` Felipe Balbi
2010-12-16 17:44           ` Greg KH
2010-12-16 18:14             ` Greg KH
2010-12-16 22:33               ` Stephen Rothwell
2010-12-06  1:47 Stephen Rothwell
2010-12-07  4:43 ` Greg KH
2010-12-07  5:49   ` Felipe Balbi
     [not found] <20100805132208.74bf6ab9.sfr@canb.auug.org.au>
2010-08-05 10:17 ` Jiri Kosina
2010-08-05 10:35   ` Michał Nazarewicz
2010-08-05 22:36     ` Greg KH
2009-12-23 22:30 Stephen Rothwell
2009-12-23 23:38 ` Greg KH
2009-12-24  0:22   ` Stephen Rothwell
2009-09-23  6:38 Stephen Rothwell
2009-09-23 12:38 ` Jason Wessel
2009-09-23 12:50   ` Stephen Rothwell
2009-09-23 13:20     ` 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=20110217180456.GA17077@kroah.com \
    --to=greg@kroah.com \
    --cc=alex.he@amd.com \
    --cc=andiry.xu@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --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.