From patchwork Wed Oct 25 03:33:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 157809 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp2345575vqx; Tue, 24 Oct 2023 20:33:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGC+DSmuUEXAZP4wdYpZh7XaxI06gzuStZIMfKp2FbyrQZkg2a3kBaJFKnsBIg0ZcZPg+E5 X-Received: by 2002:a1f:7d42:0:b0:49d:fab:fa37 with SMTP id y63-20020a1f7d42000000b0049d0fabfa37mr12838049vkc.4.1698204835418; Tue, 24 Oct 2023 20:33:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698204835; cv=none; d=google.com; s=arc-20160816; b=J//fTIB37nN2+wRz4U9/8MAfI7LeX85Yx8aaJLFt6irqIDn33Xj5+IL/8XMFBdn2hS 7U/hZ3PQqeeFx/VcWgvB4ppGKYa5jw/VeSf3VbhRrMUuDi8yCpNnQ1OUrvXC3tZ8Qo/Z TM+lJTSTfjfCs5BCy9Zl4WvtCu2/h6dXGqfaI1x1wxwdscUQh5LODIbxkHjlNTbnKZ6a 8rFtrLPALNBH/osgJVrDGwi4QQ+uj9XnygH9/TAHgljROm0Ucuy5uFiYLIWw++iJXxGr AVfYUjhPFfuSjtQds5lcaNoMPLJnLqgmdrIFOGcje7a4yCVPSB4tPYBo7tzl6DXWJ3kH mkiQ== 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=2/MNtZj22F476DYahEpd+r4Kge0Nga8hsCL0uUv65kM=; fh=ofM8KSAk5rg3ioIFDUyE5fxRMg54tXMzbWaSFd+NW18=; b=I950hMhtt4HK2Vq55Qf8QI2WFrw00ityvfKLYWsHe1TQX02paONU4vs4spKqQVVzbe vW8u9CRzztVnGi8zbOMsQTD4w619kEC62hevZYnzxTPZinDBfIScKvJh6uPdPLTakSCS 6NHERf53FauaQ8iX9L/gqY/lug0JgpBKWokEgKr6pp0ybjrLDbKGfZHdb8Q1lCPIe3Mw 1FSOa50fi+JPc6z/0lRI4E2K7/QyTuU6qLKA0o8yqGWx39tB2eXoKEp33aKPqyh4u/RD ZXgyOLjwQUpTJNuMT6gmz1KEOwHbQPNMfg2dH47FIQcCSUYRoRq5wAQJ5OHvLMhbEqp9 ujEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=urHrfBKa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id t67-20020a0dea46000000b005a7b4627ed5si9457327ywe.8.2023.10.24.20.33.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 20:33:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=urHrfBKa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id E11AA80C3471; Tue, 24 Oct 2023 20:33:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232417AbjJYDdi (ORCPT + 26 others); Tue, 24 Oct 2023 23:33:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230093AbjJYDdg (ORCPT ); Tue, 24 Oct 2023 23:33:36 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA343AC; Tue, 24 Oct 2023 20:33:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698204808; bh=2/MNtZj22F476DYahEpd+r4Kge0Nga8hsCL0uUv65kM=; h=Date:From:To:Cc:Subject:From; b=urHrfBKatVB+73QhDU4xJNcWUuDskAVw92AcZdwBFiFkzwCiKcGrrcsa/qinJBWZX jU+9PtGBasKk/eFbpBMEab56TZdp6uqI5YTor3OsTPH62fIMa8dLvF3vQekA0gxuBM 8fRXU0oTvaordKyVJcVkfm101FXBdQV3ALo4PO32thADbt9F8lopw9vrSSFepLT6aJ hO3TWgFZmnMuIpuRZ26NxBK+Wb28YSKKt7kDtewXkNjvHyaFswvRYQZihIm9ToxdkZ gH+dXkSV0hG67o1fbGQl9jbVb4QmCTVbMMk4B6LNePc1HQKwfvBEDY5RmDYJ4W6DEc CWg6aV6HtdPeA== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SFZJl3gfpz4wd1; Wed, 25 Oct 2023 14:33:27 +1100 (AEDT) Date: Wed, 25 Oct 2023 14:33:26 +1100 From: Stephen Rothwell To: Greg KH , Heiko Stuebner Cc: Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Sascha Hauer , Sebastian Reichel Subject: linux-next: manual merge of the usb tree with the rockchip tree Message-ID: <20231025143326.1ae29596@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 24 Oct 2023 20:33:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780696833486367248 X-GMAIL-MSGID: 1780696833486367248 Hi all, Today's linux-next merge of the usb tree got a conflict in: arch/arm64/boot/dts/rockchip/rk3588s.dtsi between commit: 5a6976b1040a ("arm64: dts: rockchip: Add DFI to rk3588s") from the rockchip tree and commit: bbd3778da16b ("arm64: dts: rockchip: rk3588s: Add USB3 host controller") 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. diff --cc arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 2993e1255042,8b4c99b49798..000000000000 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi