From patchwork Wed Jul 26 01:10:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 126034 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp123597vqo; Tue, 25 Jul 2023 19:02:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlG3rYFdnF3ltLMoqblgHKaafYZiOy1F2/9AVZSd8Sy8Fj0QxHOdJ7YEYN5HqQQaXfA29/Yp X-Received: by 2002:a17:906:31ca:b0:99b:c830:cf23 with SMTP id f10-20020a17090631ca00b0099bc830cf23mr129797ejf.27.1690336921453; Tue, 25 Jul 2023 19:02:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690336921; cv=none; d=google.com; s=arc-20160816; b=aWLFKP3Nv+s4TQNK/frWqNEhjHuls12mwjFzAPKnygnaF1brrxgPoTcXbJ77YwY6Kb UTY93uIMc0tt5MmZ+z1X7M9Ll+Ia04WVjFgXSAOB2kSA5H1eAYeyCT/RIu/36MHZOLmD yheZVXkvdIoP0Deu9nCTND7PsQnJeSzUTR9jyLRkuldopWgke+iaVm6dzp0qY/CuOQcl ymbRwx1084yFdTvGS60WYOEt6Lxk0mi4lfrfJmtESeERaJGTRIviPoZZ3lXCaq1vZwlu z5VErgv1PVQxVYxQEyDlYchgPu9IkPspq89lNDzzddkX6VanbULF8H0gfZriaIUQ/DOh KH+g== 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=x81De0pyPq/SqFSFmk4EAkh9ZgAg19r+n3E+hX4bWn8=; fh=XwOq5wr0z4GP9eso5wYM0CpwQpmhYcTUkkQ48zypvTE=; b=WgIbANP0N7ixHWEpkhnJeqbS+FFZU0LpAGjvEpiQLCk+lQJtzw+p55gwFv9xf7bYO0 z9Rh2S1o9yGAqHzm7eqb7ldm9JHd4JLch52/n4v65r1wTTeFQ02e+60HDTZfP9dOn4Gp zXKRZubOI9O2btYRCs3KNX4aIZqrZvDOi8PtqD8w2yq+6aXO1YUUQFvDIkmEcYC44+XE 9SVyBAnqhOsqwlPixXDl9S1os1vjTK7JXzksxIX7m38LHA3iAuS5gR7jrvijgqhOPNvK USR4V8Xxs/xv940B4FzXNySWdFiOYSsZkGblHRPfVMCSVG8kGbMF3Plr2jOkh7vjVdmn KDHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=XXI+kGZc; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bm8-20020a170906c04800b009888b617ebbsi8314515ejb.606.2023.07.25.19.01.37; Tue, 25 Jul 2023 19:02:01 -0700 (PDT) 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=XXI+kGZc; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231247AbjGZBKj (ORCPT + 99 others); Tue, 25 Jul 2023 21:10:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229870AbjGZBKi (ORCPT ); Tue, 25 Jul 2023 21:10:38 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA2CF212D; Tue, 25 Jul 2023 18:10:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1690333830; bh=x81De0pyPq/SqFSFmk4EAkh9ZgAg19r+n3E+hX4bWn8=; h=Date:From:To:Cc:Subject:From; b=XXI+kGZcIIAiMbkcPVwkd8Ri5HUoisUR4qXDrU0ZSdooBCn3+qisR/r1z8y342fBL 2yueWtURHxa1ylTeX2ee9qP48kFz7lwhHnAY5VNiGLEpmAHVoiXnPrA+MKVXwm1TsT 1RtfyKeWxRNgFtLdn8v5yVIVGfRbYMtoYp/SYZaxlS0oyVewmyPRCxYfAsL1yXpadr EGLot4+l5az9FOujR3SbqKdI65mHpk7Gj3s+VQL1AgKtOTVlbcuivjNInUUGFd0qKN qspHULOZHDksHu+Rgp/w8Vr/tdzPCGg8jOCBVVvmsdov3zZh+GFDjYW95Z9+YKTS6h H8u216zxuEZ8g== 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 4R9bRn1dQYz4wZs; Wed, 26 Jul 2023 11:10:29 +1000 (AEST) Date: Wed, 26 Jul 2023 11:10:18 +1000 From: Stephen Rothwell To: Alex Deucher , Dave Airlie Cc: DRI , Alex Deucher , Christian =?utf-8?b?S8O2bmln?= , Linux Kernel Mailing List , Linux Next Mailing List , Srinivasan Shanmugam Subject: linux-next: manual merge of the amdgpu tree with the drm tree Message-ID: <20230726111018.6a023a7d@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1772446727494450255 X-GMAIL-MSGID: 1772446727494450255 Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c between commit: 8a206685d36f ("drm/amdgpu: use drm_exec for GEM and CSA handling v2") from the drm tree and commit: 30953c4d000b ("drm/amdgpu: Fix style issues in amdgpu_gem.c") from the amdgpu 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/gpu/drm/amd/amdgpu/amdgpu_gem.c index 7da871972a8e,992dfd3de49c..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c