Received: by 2002:a05:7412:2a8a:b0:fc:a2b0:25d7 with SMTP id u10csp255159rdh; Wed, 7 Feb 2024 04:04:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IHTVzZSqLt5hjIhdJOBXkhGxOZLY6G2dz/5Jn3rWcKgKqiiY/O5JE8+YXCvgQVML6q2LQt9 X-Received: by 2002:a17:902:d2cc:b0:1d9:bed3:ba0b with SMTP id n12-20020a170902d2cc00b001d9bed3ba0bmr5409121plc.9.1707307458674; Wed, 07 Feb 2024 04:04:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707307458; cv=pass; d=google.com; s=arc-20160816; b=vnz8kJSocKZPAr0D77BxNqS4ZcAqkax1UVywQ9uRVjBPtuaHbO9YTqC9SADxJS369e OW6gaFY79DLlC1Wq2X4ZMnDokysXq3ux1NhSSImGRQboKVeTcYWMGahbZQ22xTwZ3cES iTveYSpn1BuGZbgzzInLLEeE+MlaRWp0nZYTX44YUhdqwhaRBlO+nJ9Fw5nNexgWjABq 5juB+EUl6U7o8vV8gy44nWVnaoP6Dia+GqcjeXwfjheJLhnL0eD5M9irj1V8+Dpp2uin Kwtf6UnHDCMiJxcDON/X/JN5nKJQTvaO9BtspcMMEBminY5sjl9OsR3MSx/ZG0nli8Ln RYYw== 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 :user-agent:content-transfer-encoding:organization:autocrypt :references:in-reply-to:date:cc:to:from:subject:message-id :dkim-signature; bh=lLOLMXJsAYbQ6m+PnkysiiwQB1o67gcWOvRURYVCQ7c=; fh=EOiw1YuOHqcN+c0PVQ0nSmcIkgHXaqaVZiNAkJ5K7Vg=; b=fh5BV79pgz34GkdiqyZOdY6P1Dv0CZMiSp7IVapJWXFxoUjnPOpikHfj/TU/0WRiUr qT+ArA5oiaSg+zo+wDEbfw5Q0cHiu00U+Ht1SBoRgPbz+nVhmqzdKu13L86Gzoz3hIPa YcPLOzLnh5lFv7UDqccKnV0EJdcVnyakLJipZ4TDIkbuHMXsyKIB5o353TXUN9WLTVtw B8Til/L8kMhgW3mNAXE5fT7q+e8vbg4uW53xuJN7l68QkHlQDcww1s1czPYpB6DCYR/z BX0+48wMchMoXgP9tSIhj+vxItP3puDwZdq1FsH8FdQIFHgDPnX/7tJBhzOeJU00XFi5 5yww==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Nf1misr0; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-56044-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56044-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Forwarded-Encrypted: i=2; AJvYcCVtshC8h+4Kc++Ce9qTPCIH0RRpxwoX8gWFudQTRUWZOT9XECjj67KW4v93NZNtrHQjUUZP/1FdV9ay4Yeas1aB3laoJDmuwJkKMmag4g== Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id z11-20020a170903018b00b001d904d7c449si1529247plg.271.2024.02.07.04.04.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 04:04:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56044-linux.lists.archive=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=@intel.com header.s=Intel header.b=Nf1misr0; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-56044-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56044-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com 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 C593628BD68 for ; Wed, 7 Feb 2024 06:56:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DA41B1CF92; Wed, 7 Feb 2024 06:56:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Nf1misr0" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (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 8C71C1CD3A; Wed, 7 Feb 2024 06:56:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707289008; cv=none; b=TX7I6waNVsLImPvDtx3AxeYnGi4m+r0LilJ84vfOYGOmjjyi3PndtT7oo8TUO/m1OzIKdAvLZS22rH4H+MUVgPrXGOHRi+4A2/1ThcnospbIksLaQRkmt6hyCE/qwNjiSWBg1M/ZspzPSUaMrQCai9UNwtq/uvCHSgBsce8bRDc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707289008; c=relaxed/simple; bh=lLOLMXJsAYbQ6m+PnkysiiwQB1o67gcWOvRURYVCQ7c=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=UA3D3HffjNltyvM2L/GWP6mlp8g/2v/+hOmMG/6g1qSkWOvbxsGLtXxGGMKKD4rgeNLKUnEUaPpYDFsye1FM6cdD87pFtZaix+M6uG/fRfqVqU5xufF76NTFGnGirhSQKJJZkmKrOBsD4FXDBJFCxs/R1LF3eFDU3i/ln5AZSWg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Nf1misr0; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707289007; x=1738825007; h=message-id:subject:from:to:cc:date:in-reply-to: references:content-transfer-encoding:mime-version; bh=lLOLMXJsAYbQ6m+PnkysiiwQB1o67gcWOvRURYVCQ7c=; b=Nf1misr0tNNbewIJ/sbE9VxGCo0yWeOwC8M1mgoE6ljFtqFJfBvviQg7 bjdEvcEugDFHMG2H1EfLiR5ANeE/G18OeswhfEMbcewT13zKUzieIGuEX 7hMjYSk89CoRSKXDGGtB1Yc6HUwchpyX0Vg8tiXu9I0knALNMdN2MBLqq ScfQoTTUnfS78GNwLg0kwej7by8HS1kptKE9Ae3geUpIKRXCKiccu9ND6 1mWIl2pMDm1+ZHG2sYMHDY+aV4uY7OukoN7mXeAcEvJXsgtqqgWTf4xWf pCVU5s7HnO4kcAGFXl94AVziZso8a1cqvty85dw1BTxbog1jkxctQ5Iem Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10976"; a="11508193" X-IronPort-AV: E=Sophos;i="6.05,250,1701158400"; d="scan'208";a="11508193" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2024 22:56:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,250,1701158400"; d="scan'208";a="1477944" Received: from yuyingfa-mobl.ccr.corp.intel.com (HELO [10.249.254.50]) ([10.249.254.50]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2024 22:56:42 -0800 Message-ID: <5b3adb702cfaa944fdaa1b49ee7f10e4d0e86b2f.camel@linux.intel.com> Subject: Re: Re: linux-next: build failure after merge of the drm-misc tree From: Thomas =?ISO-8859-1?Q?Hellstr=F6m?= To: Lucas De Marchi Cc: Stephen Rothwell , Daniel Vetter , Matthew Brost , Rodrigo Vivi , Christian =?ISO-8859-1?Q?K=F6nig?= , Somalapuram Amaranath , Intel Graphics , DRI , Linux Kernel Mailing List , Linux Next Mailing List , Dave Airlie , intel-xe@lists.freedesktop.org Date: Wed, 07 Feb 2024 07:56:39 +0100 In-Reply-To: References: <20240206122822.12a2df89@canb.auug.org.au> Autocrypt: addr=thomas.hellstrom@linux.intel.com; prefer-encrypt=mutual; keydata=mDMEZaWU6xYJKwYBBAHaRw8BAQdAj/We1UBCIrAm9H5t5Z7+elYJowdlhiYE8zUXgxcFz360SFRob21hcyBIZWxsc3Ryw7ZtIChJbnRlbCBMaW51eCBlbWFpbCkgPHRob21hcy5oZWxsc3Ryb21AbGludXguaW50ZWwuY29tPoiTBBMWCgA7FiEEbJFDO8NaBua8diGTuBaTVQrGBr8FAmWllOsCGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQuBaTVQrGBr/yQAD/Z1B+Kzy2JTuIy9LsKfC9FJmt1K/4qgaVeZMIKCAxf2UBAJhmZ5jmkDIf6YghfINZlYq6ixyWnOkWMuSLmELwOsgPuDgEZaWU6xIKKwYBBAGXVQEFAQEHQF9v/LNGegctctMWGHvmV/6oKOWWf/vd4MeqoSYTxVBTAwEIB4h4BBgWCgAgFiEEbJFDO8NaBua8diGTuBaTVQrGBr8FAmWllOsCGwwACgkQuBaTVQrGBr/P2QD9Gts6Ee91w3SzOelNjsus/DcCTBb3fRugJoqcfxjKU0gBAKIFVMvVUGbhlEi6EFTZmBZ0QIZEIzOOVfkaIgWelFEH Organization: Intel Sweden AB, Registration Number: 556189-6027 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.3 (3.50.3-1.fc39) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Tue, 2024-02-06 at 14:21 -0600, Lucas De Marchi wrote: > On Tue, Feb 06, 2024 at 01:39:28PM +0100, Thomas Hellstr=C3=B6m wrote: > > Hi > >=20 > > On Tue, 2024-02-06 at 12:28 +1100, Stephen Rothwell wrote: > > > Hi all, > > >=20 > > > After merging the drm-misc tree, today's linux-next build (x86_64 > > > allmodconfig) failed like this: > > >=20 > > >=20 > > > Caused by commit > > >=20 > > > =C2=A0 a78a8da51b36 ("drm/ttm: replace busy placement with flags v6") > > >=20 > > > interacting with commit > > >=20 > > > =C2=A0 dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel > > > GPUs") > > >=20 > > > (and maybe others) from Linus' tree (v6.8-rc1). > > >=20 > > > I have applied the following merge fix patch for today.=C2=A0 This > > > makes > > > it build, > > > but more is likely needed ... > >=20 > > There was a manual fixup for the drm-misc-next merge into drm-tip > > that > > did the right thing here. > >=20 > > How do we ensure these are included into the linux-next builds? >=20 > I think it should have been done in commit 4db102dcb039 ("Merge > drm/drm-next into drm-misc-next") > when drm-next merged back into drm-misc-next. Now one option is > probably a > commit on drm-misc-next with this content: > https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=3D= rerere-cache&id=3Dc39c6e3d74203820ef630884a5323237696bd36c >=20 >=20 > Lucas De Marchi Indeed. Not even drm-misc itself compiles with xe enabled. I'll ping drm-misc maintainers. /Thomas