From patchwork Mon Sep 25 01:41:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 144359 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1104279vqu; Mon, 25 Sep 2023 03:19:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHznPtliA9x8Xqld+ncF6Beu+gIOmJg65bwRPhSM0iiPXa2Z022jgMGJE0KE+wx4xgdHG8m X-Received: by 2002:a17:90b:350a:b0:267:f094:afcf with SMTP id ls10-20020a17090b350a00b00267f094afcfmr4192465pjb.12.1695637149788; Mon, 25 Sep 2023 03:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695637149; cv=none; d=google.com; s=arc-20160816; b=Crwmkd6hcA7iMFIlSuHoRGsT+pFuxxte17izNw2mKKTGfmfGkcsE1nRzljqEPnpD8H Epgr7tmFkfBvRDNMrHclk2QXuXgrwSGU4kA1X5nKoOqqoa+dCwp/0ZnKwlLXsZ4iESvU Ki5TilAL3PQ89Rw9+QMubu25bxEucUXel25HSInFMxOXC0RnFg18Wj9Q83TnffjfYTlH QfljyURhY//RQ9JrIUQcNuvzaJOHqQDRw2gJp2VPnVxi2fd9tpWSKeT4aWSPwtc3y92G 6yjhB5j3/ZrTdDCgw4KiFrzaDDhiMEfHE0vjiSLwyTivgM6vss0LDlDAgQbaPkzPfrcq pD0Q== 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=3qefOlEg3x4dwzzWD/jkdN7oH40vPOPDnPJgAYifuiQ=; fh=Z3SlnIuuBRjxeOEB/zzW4g+3/B0i7aHgU8Uvm2Eu3jI=; b=VAQzPt6hHmIflfl+YgI41fYIrrvsQDw8qLfmMtbCtjLNOPNhbAtYOBITq4kdkoYawe L4bW6pow3ANdSCR6x3a+ALJekQA3gYqN9LNc1OKgir0E1hQMdNte5nYNLiPerPTpMwbW aEwl3RAJahAYrz3oX7XfAFWUxNAANdDT5nxvP1eC91weKQF0JKsxoCsYeqMuR45IJJfe WnQ7ner8XIGhwOzMgsUv8oH6WAQ2t+U1UACGWqYFBFHWJcknRZjLiL21/GDS6aUgGZlQ 0cOY5P7pBrvNxDbIDfsjTfX1VrBloXAdx7NfePKSJqnIf4+o0mSDRoUpgKe2sf3TQ4pr NuIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=X0l3c6dG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id x5-20020a17090a8a8500b0027740192bc9si3595539pjn.152.2023.09.25.03.19.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 03:19:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=X0l3c6dG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 43D6F8271412; Sun, 24 Sep 2023 18:42:00 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230256AbjIYBlp (ORCPT + 29 others); Sun, 24 Sep 2023 21:41:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229524AbjIYBlo (ORCPT ); Sun, 24 Sep 2023 21:41:44 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57903BD; Sun, 24 Sep 2023 18:41:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1695606096; bh=3qefOlEg3x4dwzzWD/jkdN7oH40vPOPDnPJgAYifuiQ=; h=Date:From:To:Cc:Subject:From; b=X0l3c6dGWJPDd5HdxoQWXlpvWMdaxWBTnexLtUogMmcjGsfQ3nF8xfRByjpifZ03m GSA34KCAdtya2EA2QD3qk7Z+ZTz7wD0tq/k57omodgHaAaWewoe/F7O2jmu7fgh9ny 9QkKXZyG0nSAoSZGHi4SbtCIZTdcBu8vwkm0b7kpQJHaqfQ9O4hDg0vfFW6hAt+Sku 0klREyor1Wfu2Hhr+ffOuLl8r1sXdyQf7csGsECojMVc/9mSKgDOMhaYuUDB71JLN1 xZPV8fAtWT+LkN7wnsW319xziwLFWI1nfh5blzWzGI0MrZFw0s3BxWivJptNMc9TUH JIsl4iztQVPEA== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Rv5FW5G5tz4xKl; Mon, 25 Sep 2023 11:41:35 +1000 (AEST) Date: Mon, 25 Sep 2023 11:41:33 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Cc: Jeffrey Hugo , Linux Kernel Mailing List , Linux Next Mailing List , Pranjal Ramajor Asha Kanojiya Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20230925114133.7d891b33@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,RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Sun, 24 Sep 2023 18:42:00 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778004420310221035 X-GMAIL-MSGID: 1778004420310221035 Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/accel/qaic/qaic_data.c between commit: 2d956177b7c9 ("accel/qaic: Fix slicing memory leak") from Linus' tree and commit: 217b812364d3 ("accel/qaic: Add QAIC_DETACH_SLICE_BO IOCTL") from the drm-misc 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/accel/qaic/qaic_data.c index f4b06792c6f1,c90fa6a430f6..000000000000 --- a/drivers/accel/qaic/qaic_data.c