From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7D1D2E2DC1; Mon, 22 Sep 2025 18:28:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758565718; cv=none; b=FSb/h0sTVi/M0g3m4BfMSzaHYMYgAfCjNHLFVHL8UAeLyMc7bp/hFckgjuSa2rxbVXWrJyOh724Y7/uj1juWXQ3dAjUjIxMHdzcYReYEV8/6GNgzb0R+b9U+Gz/KaEjSGXEs+a1kfZRsK5e1RGb2jqov55R3hyCAb6k0Dyx3/p0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758565718; c=relaxed/simple; bh=CtXv+R6iAlZW62kHx4mvRdzMvmB9GMmmeZkvV3T4gNM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=SZFBXrm9noQIpk5HUMyVYTasyPM5oP9Yemi4/EjYsbdrkIPDAa4A+ejMp8ESgk/VMNw7zO5wnPJQSZYz8P0Wy0SWdUFoGuSpiTsm6BSa2kN79Ig6a3FmReo4OQi/6Fl3+V86r/otp/RQwDwid1IxY35MNA8kjtK7T9Vhq67cbbE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mY9mgklH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mY9mgklH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D86DC4CEF0; Mon, 22 Sep 2025 18:28:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758565717; bh=CtXv+R6iAlZW62kHx4mvRdzMvmB9GMmmeZkvV3T4gNM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=mY9mgklHJ2bbnmR5oqvSjp7yHIOrpCJlEoPeERuxWmHPPAaSfluGnZGWh8qo7mkS2 G65BSKgOUodgjPJshVxxerGOk5NJj9SGhY+oTqoV52+AvToKb7azjzGveZ4osMDmJb WJDV2c/eFEFQFOHsqZFXgvN6UsulJsBgwmq9GPJQmgYKDbUkuPX1PNWiA0JgvA2UES Ov4m5oDD81ct94YRLzoIZhztJwBPicV80IY80h4kbQOVTwR2BzSC6Ssa1GQIy2z0hB ejjdLU8T87Ty8lyrGe7jWb8Ei0UhwtngCiuaxH0GFqj5GFQw6h7vvyuk4orDvmC+nU JDexX6ZbDAung== Date: Mon, 22 Sep 2025 11:28:32 -0700 From: Nathan Chancellor To: Mark Brown Cc: Lucas De Marchi , Thomas =?iso-8859-1?Q?Hellstr=F6m?= , DRM XE List , Linux Kernel Mailing List , Linux Next Mailing List , Michal Wajdeczko , Rodrigo Vivi , Zongyao Bai Subject: Re: linux-next: manual merge of the drm-xe tree with the drm-fixes tree Message-ID: <20250922182832.GA1542561@ax162> References: Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Hi Mark, On Fri, Sep 19, 2025 at 01:45:19PM +0100, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the drm-xe tree got a conflict in: > > drivers/gpu/drm/xe/xe_guc_submit.c > > between commit: > > ff89a4d285c82 ("drm/xe/sysfs: Add cleanup action in xe_device_sysfs_init") > > from the drm-fixes tree and commit: > > fb3c27a69c473 ("drm/xe/sysfs: Simplify sysfs registration") > > from the drm-xe 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/xe/xe_device_sysfs.c > index b7f8fcfed8d86,c5151c86a98ae..0000000000000 > --- a/drivers/gpu/drm/xe/xe_device_sysfs.c > +++ b/drivers/gpu/drm/xe/xe_device_sysfs.c > @@@ -308,19 -290,15 +290,15 @@@ int xe_device_sysfs_init(struct xe_devi > return ret; > } > > - if (xe->info.platform == XE_BATTLEMAGE) { > - ret = sysfs_create_files(&dev->kobj, auto_link_downgrade_attrs); > + if (xe->info.platform == XE_BATTLEMAGE && !IS_SRIOV_VF(xe)) { > + ret = devm_device_add_group(dev, &auto_link_downgrade_attr_group); > if (ret) > - return ret; > + goto cleanup; > > - ret = late_bind_create_files(dev); > + ret = devm_device_add_group(dev, &late_bind_attr_group); > if (ret) > - return ret; > + goto cleanup; > } > > - return devm_add_action_or_reset(dev, xe_device_sysfs_fini, xe); > - > - cleanup: > - xe_device_sysfs_fini(xe); > - return ret; > + return 0; > } This resolution breaks the build. drivers/gpu/drm/xe/xe_device_sysfs.c: In function 'xe_device_sysfs_init': drivers/gpu/drm/xe/xe_device_sysfs.c:300:25: error: label 'cleanup' used but not defined 300 | goto cleanup; | ^~~~ I think those should just be 'return ret', as it appears that fb3c27a69c473 already includes ff89a4d285c82, so I think you can just take the right side of the conflict wholesale. Cheers, Nathan