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 X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A47CC43465 for ; Mon, 21 Sep 2020 15:49:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1593721D91 for ; Mon, 21 Sep 2020 15:49:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="VeYvcbIl"; dkim=temperror (0-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="EmATRWIF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727386AbgIUPtq (ORCPT ); Mon, 21 Sep 2020 11:49:46 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:43097 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726810AbgIUPtq (ORCPT ); Mon, 21 Sep 2020 11:49:46 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id F3A135C0232; Mon, 21 Sep 2020 11:49:44 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 21 Sep 2020 11:49:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm1; bh=g/6aPpa9+HFyn43lywpwZ+M9VIS vOyQKwhfMzJ/Fcsg=; b=VeYvcbIl9FSggoyfvyCU/siOJLDc10yw0Dn832LHvZP NErBKLBq+h2lxTeqVZuMJBG3875PKwaUWaDXCv1+MQ782KCzYoUXN85o5uZow9Kt bY0sw0rPRWtYvOi2yKkBBCBDW/H1rUi5tg6ycovKbfMdU1V7o/+bIad4OhZxDd4C utj9Y7gu5uDqBOBmby/fFcGPo/0SEQNawbG5otu5Wmex1fdb82p5GsgJPtxLPQ2Z XPaT2dVd3R/w111d7iDt6UxSrv1vkd07YwEByZrFDNjEeNriiJQOdxzB/ghcHE2F rganRq3J5FVZ9Cx6Vb2LFvSmwDLlRW2BvYDR5Ojf2sQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=g/6aPp a9+HFyn43lywpwZ+M9VISvOyQKwhfMzJ/Fcsg=; b=EmATRWIFcn5LOsd74g7Qan XSFoMach9t6/M7JwZ+p+OHowSAwhJHNbg74fRNE2G6WCRt1VKpllcktdrmAhjSse RXF0YDjT4/qSU88tnB01h3ltb1gOdtMEHwy6w+bkSP0WOr+IMCkFw8w4i4lKzUpK StT+zRBMBf3khsD+nBZm9ee9xGXyEtdTab6G+owAhSXqbF11wA5WQ1rX6oAEVr+/ c9YdTYjNoJ+hCXM+4iH1wOtP5gqU7h+uhX9JkhRfjUfddMabIKv6KS4UwO/EDGsB Rg/L4971Z/y9TkKktjYdOJZzrOvsJjpYmMisn3+j0lc84gu9oDJVo1UnsuJcaD2A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvgdelhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghgucfm jfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepveeuheejgf ffgfeivddukedvkedtleelleeghfeljeeiueeggeevueduudekvdetnecukfhppeekfedr keeirdejgedrieegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepghhrvghgsehkrhhorghhrdgtohhm X-ME-Proxy: Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) by mail.messagingengine.com (Postfix) with ESMTPA id BD6E83280059; Mon, 21 Sep 2020 11:49:43 -0400 (EDT) Date: Mon, 21 Sep 2020 17:50:06 +0200 From: Greg KH To: Stephen Rothwell Cc: Bjorn Helgaas , Nicolas Saenz Julienne , Jim Quinlan , Lorenzo Pieralisi , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the usb tree with the pci tree Message-ID: <20200921155006.GB1023551@kroah.com> References: <20200921151807.637905c0@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200921151807.637905c0@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Sep 21, 2020 at 03:18:07PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/pci/controller/pcie-brcmstb.c > > between commit: > > 1cf1b0a6dd95 ("PCI: brcmstb: Add bcm7278 register info") > > from the pci tree and commit: > > f48cc509c935 ("Revert "PCI: brcmstb: Wait for Raspberry Pi's firmware when present"") > > 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/pci/controller/pcie-brcmstb.c > index 6e7aa82a54a3,bac63d04297f..000000000000 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@@ -1213,8 -929,6 +1211,7 @@@ static int brcm_pcie_probe(struct platf > { > struct device_node *np = pdev->dev.of_node, *msi_np; > struct pci_host_bridge *bridge; > - struct device_node *fw_np; > + const struct pcie_cfg_data *data; > struct brcm_pcie *pcie; > int ret; > Looks good to me, thanks! greg k-h