From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9681BC76196 for ; Fri, 31 Mar 2023 07:53:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231335AbjCaHx0 (ORCPT ); Fri, 31 Mar 2023 03:53:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230083AbjCaHxD (ORCPT ); Fri, 31 Mar 2023 03:53:03 -0400 Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEE6B1B7E5; Fri, 31 Mar 2023 00:52:16 -0700 (PDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 9FDDC3200893; Fri, 31 Mar 2023 03:52:15 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Fri, 31 Mar 2023 03:52:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1680249135; x=1680335535; bh=Ks vbGlp6O7ZgT74trKBEeabFrQEUJq5unbKXi23ARQ0=; b=buBtjzatT0kD1METZS IBtDACOuNKluJNtIfmPR8yieP4d1v0oEAgUaApF99INgb/VHjQJy89n1NFv6qfAI Ooq4vPFxLgETCRa+qEaASosbGtVyCtBW2DaLycfGTtOgUMC1vv0E9vIYDsDCtYMW piHfWCcVWAzbrxiDMFe/38yriNITtw6g2q4AaAwfjTJj0CVJjKrDHmb7IW32fmdr dGq6N1Iyz0aXF+/LAQ4NEWQgclW4Vk+scC5NqxBoyLEoA62zSVqE+U8n8uWWRqrr PJn33wshlbvT9d5rDwzZpTYiG42iP79sAU3OhrBJ63pFHG2js0Tm4h7sfHtdGFOB boTA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1680249135; x=1680335535; bh=KsvbGlp6O7ZgT 74trKBEeabFrQEUJq5unbKXi23ARQ0=; b=ijM0oPie2tMXoyk3zlUg0l0HjozxD J6wMFRdJUyIGtXkYQe3ihGBymasjdXqF77zsIxbRmPmtDeszqMQctJabhEZ3B/1+ yDmjiATiDgyxNpnm43lyvkSsZ0jIGbTz8uE489zhb5cGqiR1PH9wyG0DkPAHo+XY kY5eOnPJaEV6Fu+CN76G7HWZ3Umh63Q1uQOm9y5/M3H/1VQQJyvyNx/+zn2ZdcjX QZCCGEzY3yUkt7cd95GAlFgCuGDUcSVo0cxDfi2jMr2aWTQ8FaD3E1jpbxtStn8s hlI7wNpMKXj20nqR31bAiGC6D0zu86TpzuxbaGCiImMRE0kQmdfraHv7g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeitddguddvgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvvefukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgv ghcumffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeehge dvvedvleejuefgtdduudfhkeeltdeihfevjeekjeeuhfdtueefhffgheekteenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhroh grhhdrtghomh X-ME-Proxy: Feedback-ID: i787e41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 31 Mar 2023 03:52:13 -0400 (EDT) Date: Fri, 31 Mar 2023 09:52:10 +0200 From: Greg KH To: Stephen Rothwell Cc: Arnd Bergmann , Linux Kernel Mailing List , Linux Next Mailing List , Mathias Nyman Subject: Re: linux-next: manual merge of the usb tree with the usb.current tree Message-ID: References: <20230331140150.597576b2@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230331140150.597576b2@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 31, 2023 at 02:01:50PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/usb/host/xhci-pci.c > > between commit: > > 8e77d3d59d7b ("Revert "usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS"") > > from the usb.current tree and commit: > > 130eac417085 ("xhci: use pm_ptr() instead of #ifdef for CONFIG_PM conditionals") > > from the usb tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/usb/host/xhci-pci.c > index 6db07ca419c3,bbbb01282038..000000000000 > --- a/drivers/usb/host/xhci-pci.c > +++ b/drivers/usb/host/xhci-pci.c > @@@ -771,11 -967,10 +967,9 @@@ static struct pci_driver xhci_pci_drive > /* suspend and resume implemented later */ > > .shutdown = usb_hcd_pci_shutdown, > - #ifdef CONFIG_PM > .driver = { > - .pm = &usb_hcd_pci_pm_ops > + .pm = pm_ptr(&usb_hcd_pci_pm_ops), > - .probe_type = PROBE_PREFER_ASYNCHRONOUS, > }, > - #endif > }; > > static int __init xhci_pci_init(void) Thanks, this looks good. I'll resolve it this way when I send the usb-linus branch to Linus this weekend. greg k-h