From patchwork Sun Nov 13 21:47:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 19468 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1843842wru; Sun, 13 Nov 2022 13:52:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf5R13Rt5mNkeKH29OCd2g6RhpntQBqjjqJ6Oeyo3IVXV/ak5sJr7OQ28tQi2wcfe4eQ3xbM X-Received: by 2002:a63:4750:0:b0:460:936b:ded7 with SMTP id w16-20020a634750000000b00460936bded7mr9601548pgk.149.1668376336825; Sun, 13 Nov 2022 13:52:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668376336; cv=none; d=google.com; s=arc-20160816; b=WaWafv4VLRafeqcF0iSO3Lr9EcpZYPV1rparXAHmEdwZo3tklUWwA3HmR50803EC6l 9xhci2TUBXVyZ8U9Y/p4hGdVf/YDTscD6VrSaOLayQvmc0LIszyh3aPpxZ/OMEHfY8B7 oUSzE+1F9e95QelZBwS12O+dnTILQGE/KOxNio6jIaFkGyiOL8tNzuHy7Invln1oYj0O sMv+lMcKZmM2fv5hVNItkhWQBsKBV4iqAeISYNbIG9wwXvWXM44pXakNDvFLUQxxjlgu T5cfBG9+xDBw1FJskHxY7X2RZuTRZk81cGCbd6vbhm0whTHYjiAirlWhR7f7Rq3BAJum 7Xsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=HD4U+AnCjj8okPsdz3mGTeIJ6mN+zeD+duUB1sBCRnY=; b=G3MvxVsoKvTE73lvp1YlBPdkVvSvh0rbchRhqlXOwpl6LhUy9Gi6maMMiBzO341Gkl Xe9dBQuyacqk15rflXA3s0iVidrpN1dlLZlnC1rBKsy2xWgQTIhkWzK77HE8obMdhKnk jGQ6hXYupYTUynTn6D2pKz1U1MwHj3luwQqS3XprN7IOPvlDOr8EjD6Phgvai0DINxlD E8m0yQEkAje1u0+mi157INfFt7Dd4O1S3qhX1Yg1PUzyg8W2cKqXRcyEkOJ9VMO6AYVs udfXzUjFkXXXIdwQZYvIKbr7jytqmF/LQ/+FW6IItkigl/OMq6/VXyXrGFSj7pdFHEeI HAaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=VcSIrR1u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d9-20020a631d09000000b00422c003b4c9si8260075pgd.46.2022.11.13.13.52.01; Sun, 13 Nov 2022 13:52:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=VcSIrR1u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233069AbiKMVsE (ORCPT + 99 others); Sun, 13 Nov 2022 16:48:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229692AbiKMVsC (ORCPT ); Sun, 13 Nov 2022 16:48:02 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E81EA46D; Sun, 13 Nov 2022 13:48:00 -0800 (PST) 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 4N9QzG61VSz4xTg; Mon, 14 Nov 2022 08:47:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668376075; bh=HD4U+AnCjj8okPsdz3mGTeIJ6mN+zeD+duUB1sBCRnY=; h=Date:From:To:Cc:Subject:From; b=VcSIrR1u5CRDVzBxONeiB/XMooVlr+eXOadVppIPau5sSqZ3ZgP+5vLuJd5gZMWry hWXitxnGzvYsQLvxLp3FEKqKSBOcV0H8k/cmOZ9VY5k8AHrACFFu2uNjd6eCZcdkAA Ef+803jiSN/xGswITyF1IJ7pWqy1oapW9ZjjUvqbkSvnwt4GCuxzLqktNkqk39dLpy G5ydVxzMx1wK5LqFtdM39NOYP+mDnCI4X8WzRbXvFqRy0hk6kPFOLkAlPjDIt3QgGJ Qfi5gLrU9sG78gREgbQU9EKoSoe3f3xlo5qYQZaucrdxU/BQrUc4YflZZWlI8b+cxp leYTZm5JkuLsw== Date: Mon, 14 Nov 2022 08:47:38 +1100 From: Stephen Rothwell To: Colin Cross , Olof Johansson , Thierry Reding , Andy Gross Cc: Bjorn Andersson , Dipen Patel , Krzysztof Kozlowski , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the tegra tree with the qcom tree Message-ID: <20221114084738.73dff88c@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749419385381096708?= X-GMAIL-MSGID: =?utf-8?q?1749419385381096708?= Hi all, Today's linux-next merge of the tegra tree got a conflict in: arch/arm64/configs/defconfig between commit: c03fa428ac6e ("arm64: defconfig: build-in Qualcomm SC7180 and SM8450 interconnects") from the qcom tree and commit: b4c8adc40f49 ("arm64: defconfig: Enable HTE config") from the tegra 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 arch/arm64/configs/defconfig index f910ccaaecf9,9ccc82e180c7..000000000000 --- a/arch/arm64/configs/defconfig