From patchwork Mon Mar 4 01:08:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 209355 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp1158532dyc; Sun, 3 Mar 2024 17:08:34 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUc8Qwu2guzfnYUw5FUENJ0B2NDNTfkbMZNq4cek2NqoWmVOYIj5UsrG8BtuTDRpyP7GfkxXpcObnGmQcKW4jTxkwXvQA== X-Google-Smtp-Source: AGHT+IFFxQx0dZglCbJ9RqyntUngm+o6fin7Er8iH+Df/aYcv/PkIwbVUtnBPsDq32lCAMjbovd8 X-Received: by 2002:a05:6a00:ccb:b0:6e5:a910:c814 with SMTP id b11-20020a056a000ccb00b006e5a910c814mr11435714pfv.10.1709514514224; Sun, 03 Mar 2024 17:08:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709514514; cv=pass; d=google.com; s=arc-20160816; b=sP6sFlJXA9fw60/VmJYas7gAvj/hHCA6YiyVm8M2vS5Met7amny343lM16KaessRoT IpawDgksXX/7G8TsjzUfnBoqc5CACOHZmyAdDWa9emeOY9e5CLOAtdlahRtZh7Z6XBUx IyHIPwbUqlluM6vK9nuK2gzJWOe50gKylK7aSFX7s+L+nq8BRuDpHsEPdwnxwVfEqe3t Jnz/hL3hp+4NcRqYtn+MIaPPzIWhO6ioBZi61tIvBwn3k8H8G4M3COR5Rl3fUZMZSNM3 6HrMxiPSH6camEs0kHqiII5ApmwgwP2IlpnYQDwO0o1gAoaXFyuwAO9R/HqbS+aK0wvf dVzQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=wCBQxlkia3rFEEfyeOb8tCdt6hGJM2RzeP67NHnaLkk=; fh=Cn1v4486keuTJtxkoGqBJvVP3/Ht95FGiT8/5wTX35g=; b=Z4RSAO9GM34k7AScy6GQVBnkBhBcUAJWIq7PoO4tXiuBJecxo68mgDMHHWfnuwxiyt 14Kb2B3q2sWdPo3BXHnv3uvCg14YT8RfsTEZdMXqicHKpiIoik1t3LiLupY9/9F2++l5 +NKOIGAa/53hGciu962NxkYkb2rnZk+drBcpRNLYAuswVGYrjd5Op5W3b0QZsAZBIFE8 1a+2YkzmBl008/ILceia/CWykH/IMqYojU+Lknxg53VoZ/1yZh06mX0obDyT68Hmk3/2 6YOgaP3l07QeLpq7IILHkDgklj1NZWmBQSCoIArwejfJRtZOS2u8Z2PS/IyYQey3+Ea+ UM3A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=TbA6wqbw; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-89957-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-89957-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id a70-20020a639049000000b005cfbd190e58si7273678pge.115.2024.03.03.17.08.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Mar 2024 17:08:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-89957-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=TbA6wqbw; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-89957-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-89957-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 0837D2810FE for ; Mon, 4 Mar 2024 01:08:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 14F5C1FAA; Mon, 4 Mar 2024 01:08:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="TbA6wqbw" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (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 4AE6C621; Mon, 4 Mar 2024 01:08:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709514499; cv=none; b=IezZA1dI/+dFCVcfnU/At7uXYA8zPcfpsV9GfxFgWBhljA0RSY8DibUBnX+7zd15tjJc9LGqVeoshDLnc5LGMHEnR0V2RiEfKfxNkv0XtcD20Korvky//w/TSz0T3JqNyhhoKGzxN7qEeEr6AubR5oIKElEjY/jTsgum62Fz4y8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709514499; c=relaxed/simple; bh=WKrlmbcoduaqZ+5CfmcQA58hirx6R6yKC0CxgaYm6eA=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=pwpT2U5TmAHB9B548FMmYdqFN1f3erfNSQW/zbSMfQfbcaMlocjR8DmPVEk7NWRmpaPOOfqJVVo6hifC/KRvPC45bci0RAr/d1tD58PyFHOsPszAyqxMjHCtIL7caRDTsR0QXX6n7dTtBQ3FjQG+c5dDeYLg4WMi5jRQIqMREK0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=TbA6wqbw; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1709514492; bh=wCBQxlkia3rFEEfyeOb8tCdt6hGJM2RzeP67NHnaLkk=; h=Date:From:To:Cc:Subject:From; b=TbA6wqbwyeQoD6PjxkVhCwoCfBHRD91oPd6a5b2KmRmoydJNntW1fF0UMK/zwHi0z 7o8l3mfqqAZDNoEHOn4UGF9WXxRUx4EcKw8sVxly3NREJBh988q3Ijha0KBN3vQOcf XpUEUKEzXjURtt3nPh81DHS8z+ZEy2RaqYr0WbOBZA5nIFbUHv7NdPhD1pWrb0VWEI scUSC+CZYGEc5haWNub1bII/3I5w1Bk6Jsa61y6hh38i3JDRbVjW5uvTsblJuKA7VW VKYEILZyI7ZSc4SN8QcjpUtDjy01UY/dRkGyZmXH2XOo9RxCEF0+7ZpNWfqUwcBcg5 g/c4lM/In2d4Q== 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 4Tp0tg3F0Bz4wcJ; Mon, 4 Mar 2024 12:08:11 +1100 (AEDT) Date: Mon, 4 Mar 2024 12:08:10 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Cc: Brian Welty , Francois Dugast , Linux Kernel Mailing List , Linux Next Mailing List , Matthew Brost , Rodrigo Vivi , Thomas =?utf-8?q?Hellstr=C3=B6m?= Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20240304120810.68681bd8@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792554594910422041 X-GMAIL-MSGID: 1792555891445615864 Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the drm tree got conflicts in: drivers/gpu/drm/xe/xe_exec_queue.c drivers/gpu/drm/xe/xe_exec_queue_types.h between commit: eaa367a0317e ("drm/xe/uapi: Remove unused flags") from Linus' tree and commits: 25ce7c5063b3 ("drm/xe: Finish refactoring of exec_queue_create") f1a9abc0cf31 ("drm/xe/uapi: Remove support for persistent exec_queues") from the drm 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_exec_queue.c index 49223026c89f,4bb8f897bf15..000000000000 --- a/drivers/gpu/drm/xe/xe_exec_queue.c diff --cc drivers/gpu/drm/xe/xe_exec_queue_types.h index 36f4901d8d7e,c40240e88068..000000000000 --- a/drivers/gpu/drm/xe/xe_exec_queue_types.h