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=-12.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 4171BC4338F for ; Thu, 12 Aug 2021 13:32:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2096861059 for ; Thu, 12 Aug 2021 13:32:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237129AbhHLNcp (ORCPT ); Thu, 12 Aug 2021 09:32:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233260AbhHLNco (ORCPT ); Thu, 12 Aug 2021 09:32:44 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF3A6C061756 for ; Thu, 12 Aug 2021 06:32:19 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id a20so7353572plm.0 for ; Thu, 12 Aug 2021 06:32:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=pN8gn6XDJx8X4O5FCMjgKbbXidE6R/vdaeWWGFTiI50=; b=W8YI8H/hnSbUW8vndQz73VUJvpgzszAc7mMX59M0eDUBjXJsQAeT/cIpJ3nJxn/Hsb QEGacGy3Z0qUIn/tdG8zmV847TXoBhK8VjH9xhUk8OEqcAvoQw2HwQeVKf0rk3O9EJ4O edW4zXX3oAgqRRraXbpWn1x3A6QTqIsWUxCwXNpyPbuiY8R3hSWe3YzDnBTDpoTKDjHy iFvVAYFk3kDynXbIjBhIY7qapDVc8f5oLfn5Nnz9q5TyesEiGL220EeS31RaqtqlmbHC SS/Os6bJCZDd53Jxsmx6Nr/AQhxqEToW6DFPjkkqEHD+hdAYeOs385Iu4wv9UCzT43V9 phrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=pN8gn6XDJx8X4O5FCMjgKbbXidE6R/vdaeWWGFTiI50=; b=LKbKrDAZ1pkmv7blgPb5KyS+8pR1s/Kkxg/CXXmdSRBbM8s/UUolPdupTybGdqElKP EiQKr87cQOFAd8Oww55cUHOJ/rI8SQfS/SwoJepNnGqu0TuRD2pr2tGXBmHoIUVedUii G0skVDQZZgINvfxyc9F+I7fNLiqfLAwfF5hGe13H1o1N+ef0/n5rZDKrko0yrNK2Qvvj MCI5pXnD6V6chLx9KchlAWRgxSWjWBTsgFd3FOMU7hA87NKIr8X9mSTvRS2OzfCHhJEp GFLpK6bVbO0VggDdq6nPzJE8F0kXyfuClm9aO3C7rRj7+TS+eDc/onUqo/Jdk+jsv3lk /v2Q== X-Gm-Message-State: AOAM531Dn4Ir7qfiXaAppqe3SROiBrfIHaC56+OSkyq0jb2IU1k/5CT0 tu7tetkA+LvyutSgblxnHBav X-Google-Smtp-Source: ABdhPJwLPHcmKKCvzEOp8J0CQ2RxkJ31f47XgenwLO2Jq4zYxBMA8pGHIGfgky6xC9N/7X6hkeJ4FA== X-Received: by 2002:a17:90a:3fcc:: with SMTP id u12mr15580048pjm.5.1628775139259; Thu, 12 Aug 2021 06:32:19 -0700 (PDT) Received: from workstation ([120.138.12.52]) by smtp.gmail.com with ESMTPSA id j19sm3468141pfr.82.2021.08.12.06.32.17 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Aug 2021 06:32:18 -0700 (PDT) Date: Thu, 12 Aug 2021 19:02:15 +0530 From: Manivannan Sadhasivam To: kuba@kernel.org, davem@davemloft.net Cc: netdev@vger.kernel.org, richard.laing@alliedtelesis.co.nz, linux-arm-msm@vger.kernel.org Subject: [RESEND] Conflict between char-misc and netdev Message-ID: <20210812133215.GB7897@workstation> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Hi Jakub, Dave, Due to the below commit in netdev there is a conflict between char-misc and netdev trees: 5c2c85315948 ("bus: mhi: pci-generic: configurable network interface MRU") Jakub, I noticed that you fixed the conflict locally in netdev: d2e11fd2b7fc ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net") But the commit touches the MHI bus and it should've been merged into mhi tree then it goes via char-misc. It was unfortunate that neither linux-arm-msm nor me were CCed to the patch :/ Could you please revert the commit? Thanks, Mani