From patchwork Fri Jul 16 03:37:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12381361 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=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 7C9BDC636C8 for ; Fri, 16 Jul 2021 03:37:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6546F61279 for ; Fri, 16 Jul 2021 03:37:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233822AbhGPDkj (ORCPT ); Thu, 15 Jul 2021 23:40:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231230AbhGPDki (ORCPT ); Thu, 15 Jul 2021 23:40:38 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECA87C06175F; Thu, 15 Jul 2021 20:37:43 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4GQxl72GCdz9sWq; Fri, 16 Jul 2021 13:37:39 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1626406660; bh=c/+0RngVoUmF3ZMyOrfkI3149vXfqWPL3fp4p18FB4Q=; h=Date:From:To:Cc:Subject:From; b=XKeRkGhOUnue6xIiT7k4E50bqBiIRxuAio39mHEAd5PGIPuuWSp40i83zoQLgpb1o ViY5ObBXh/yKnkLQ0jWj/Y6lySON1rt7om/4CwjCrowxZ4sQ/nqBIbykXf1cL0iF9s 0Eqvh1IUL2b8azQUyUTunHrvhfKqacfu852ilXez+Z/kNsgrcxUyuyfEtlmVMkOqAn Y1Jn3qEfniKq1KcJneiENbMeGLvnnk8V2VyXFUDF+zZmSUrP1W6qY7fYERvFoZTgJV Zr2AkFTFk2D39cbYX6LiJNKqqqHzK50NyVVK5Wx//p9GyER4UaNTHz5kjtmCmCbaOG DHzuXcHSbld1g== Date: Fri, 16 Jul 2021 13:37:38 +1000 From: Stephen Rothwell To: Manivannan Sadhasivam , David Miller , Networking Cc: Bhaumik Bhatt , Linux Kernel Mailing List , Linux Next Mailing List , Manivannan Sadhasivam , Richard Laing Subject: linux-next: manual merge of the mhi tree with the net-next tree Message-ID: <20210716133738.0d163701@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the mhi tree got a conflict in: drivers/bus/mhi/pci_generic.c between commit: 5c2c85315948 ("bus: mhi: pci-generic: configurable network interface MRU") from the net-next tree and commit: 156ffb7fb7eb ("bus: mhi: pci_generic: Apply no-op for wake using sideband wake boolean") from the mhi 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. diff --cc drivers/bus/mhi/pci_generic.c index 19413daa0917,8bc6149249e3..000000000000 --- a/drivers/bus/mhi/pci_generic.c