All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Kai-Heng Feng <kai.heng.feng@canonical.com>
Cc: mathias.nyman@intel.com, Lars_Chang@asmedia.com.tw,
	linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Revert "xhci: Limit USB2 port wake support for AMD Promontory hosts"
Date: Mon, 28 Aug 2017 11:29:59 +0200	[thread overview]
Message-ID: <20170828092959.GA24193@kroah.com> (raw)
In-Reply-To: <20170822091447.19126-1-kai.heng.feng@canonical.com>

On Tue, Aug 22, 2017 at 05:14:47PM +0800, Kai-Heng Feng wrote:
> This reverts commit dec08194ffeccfa1cf085906b53d301930eae18f.
> 
> Commit dec08194ffec ("xhci: Limit USB2 port wake support for AMD Promontory
> hosts") makes all high speed USB ports on ASUS PRIME B350M-A cease to
> function after enabling runtime PM.
> 
> All boards with this chipsets will be affected, so revert the commit.
> 
> Conflicts:
> 	drivers/usb/host/xhci-pci.c
> 	drivers/usb/host/xhci.h

Why are these "Conflicts:" lines here, you did fix up the issues, so
there shouldn't be any more conflicts.

And if you revert this, don't we still have the original problem here?

thanks,

greg k-h

  reply	other threads:[~2017-08-28  9:29 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-22  9:14 [PATCH] Revert "xhci: Limit USB2 port wake support for AMD Promontory hosts" Kai-Heng Feng
2017-08-28  9:29 ` Greg KH [this message]
2017-08-28 10:14   ` Mathias Nyman
2017-08-29  4:56     ` Kai-Heng Feng
2017-09-16  4:49       ` Kai-Heng Feng
2017-09-18  8:06         ` Mathias Nyman

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=20170828092959.GA24193@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=Lars_Chang@asmedia.com.tw \
    --cc=kai.heng.feng@canonical.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=mathias.nyman@intel.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 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.