From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751242AbdH1J3y (ORCPT ); Mon, 28 Aug 2017 05:29:54 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:39806 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750866AbdH1J3x (ORCPT ); Mon, 28 Aug 2017 05:29:53 -0400 Date: Mon, 28 Aug 2017 11:29:59 +0200 From: Greg KH To: Kai-Heng Feng 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" Message-ID: <20170828092959.GA24193@kroah.com> References: <20170822091447.19126-1-kai.heng.feng@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170822091447.19126-1-kai.heng.feng@canonical.com> User-Agent: Mutt/1.8.3 (2017-05-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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