Received-SPF: pass (google.com: domain of linux-kernel+bounces-55590-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Tue, 6 Feb 2024 14:21:09 -0600
From: Lucas De Marchi <lucas.demarchi@intel.com>
To: Thomas =?utf-8?Q?Hellstr=C3=B6m?= <thomas.hellstrom@linux.intel.com>
CC: Stephen Rothwell <sfr@canb.auug.org.au>, Daniel Vetter
	<daniel.vetter@ffwll.ch>, Matthew Brost <matthew.brost@intel.com>, "Rodrigo
 Vivi" <rodrigo.vivi@intel.com>, Christian =?utf-8?B?S8O2bmln?=
	<christian.koenig@amd.com>, Somalapuram Amaranath
	<Amaranath.Somalapuram@amd.com>, Intel Graphics
	<intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, "Linux Next Mailing
 List" <linux-next@vger.kernel.org>, Dave Airlie <airlied@gmail.com>,
	<intel-xe@lists.freedesktop.org>
Subject: Re: Re: linux-next: build failure after merge of the drm-misc tree
Message-ID: <tughiv3y52m6ruczgb3g6mvvek7ihfrxaxh7ovoogzqfi6jmun@jcn6xap7vwcg>
References: <20240206122822.12a2df89@canb.auug.org.au>
 <f9a027765a3c65c69c2d49cf2964fe1155e914f4.camel@linux.intel.com>
Content-Type: text/plain; charset="iso-8859-1"; format=flowed
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <f9a027765a3c65c69c2d49cf2964fe1155e914f4.camel@linux.intel.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-1?Q?Knns0zH1QfC2mx7c9DtNMdBgI2vnbpDGVe21KHBmsOGQ351/cXVsxBzAgo?=
 =?iso-8859-1?Q?NshbOMWAtGI9Rx6t/rSCGQoGXABF9FSM4IbYNPLLAfcMG8sH05rWNd0s94?=
 =?iso-8859-1?Q?ndP+WogSyui/yu6F4DVP4XJtQGSUMUC4qTSR+XIDSJFTqQ/wnLHSVWMpi1?=
 =?iso-8859-1?Q?1FWD/OS+O/hWUDGbyHUT7S99o1kaOTI29sWwysHE/RyleuH+hB8y+3lKiz?=
 =?iso-8859-1?Q?m4XbCO5pe9J3z7+mjbEWA5hcSvnybmwmRFDR3acQw3PdAs9idXGihM6TKz?=
 =?iso-8859-1?Q?NUWxdfyAPV3yKgkLGwO+vR1M3cF/mvnXsxovmYchQSZBSSOrtzHMkcxM1T?=
 =?iso-8859-1?Q?rZ1B37llFEbGzrOSFfWEyZB9qBBFk7/RkXG3/wR9I1anPjRbOrZf1j7gWD?=
 =?iso-8859-1?Q?53J8xQoeW8QNUeweL7nNX4oHTTSuy1Fl2pw2j4pPbMz8exUthfSk3Gp8is?=
 =?iso-8859-1?Q?AHMXUkIRQ0fWi3TlDSc0CZpcCqCH7Olzl/mk7J2osJxu0G0Fr7mdtpz8yA?=
 =?iso-8859-1?Q?c7XuTusmUzsnHO8Gu4N9mWEc47H+w2jo5p3WCZn9lq0Eiz8YEdZdJ23r8G?=
 =?iso-8859-1?Q?p/CGsSSQdNcSzaZQmM0JMSyJCexRliwf2oyBdGrS/VkcJSnDVXDN4+STm4?=
 =?iso-8859-1?Q?E94pSz7wJM/gLi1zGNqQYSTG8wpjNRyaNNaWoWKsymL1JlqJemIUxnwyX2?=
 =?iso-8859-1?Q?xKfo8cubppELsAFnws4Nw3+okW3Nn9TLH0Sqo8cDcY0ljYo6K9EhqcBduv?=
 =?iso-8859-1?Q?kD+LKns0oB8GyA9sdPWMbfs75MS9JrZY1U2xsrnBgMxhteMByX86Fu2JY4?=
 =?iso-8859-1?Q?mTBzI5UNf0HBp9MJVQafZeyBvngWd9gxUt91IWv+NCdx+79bqu3lfH03PZ?=
 =?iso-8859-1?Q?6hE5hiDM5vmMSPGUu1vTd+8T3nbSJ/oLw1MljQCI5ZKeuPO9B+jLS+SdS7?=
 =?iso-8859-1?Q?pTMm5VwlYTqmPt13lSG9e1CppyahHuiU9C4JxFPTw6YrJLzTyKftZ0tcg5?=
 =?iso-8859-1?Q?1XAuWLUUV4jDWKa8H1OwbJMpwrERKLw5c0Ui0tMxExyEsX3OlwKA6FihgS?=
 =?iso-8859-1?Q?WG3jqTc0mCDBckxG9RLFLWwj44LVn9idJjnbZv/i/XVXzEOXjHKk1mNDek?=
 =?iso-8859-1?Q?3/AiexPdvDRI89LzDxv4nD8Hg5f5gQdEX+jMZVnTktfIi854WL1Kjhmz1B?=
 =?iso-8859-1?Q?tfSn5fI0vTQo9Z0wAvG35uYrRy2P7HRAkG13KUWmoJtUGbHl51J+KBSEa1?=
 =?iso-8859-1?Q?SnaaP1iB81MDvwyVGOwqLwvyi1egqxjCZYam4U7sGvi2r2/+4xNfkCgO7n?=
 =?iso-8859-1?Q?0jBOpQG7weBvRVBwDkkUj7s6ZXnL7a/+fkTJ1fSnuOWqPOBVsoPfWXpYpB?=
 =?iso-8859-1?Q?CtH80E83jlTl1JuofWhOWqJxdu+E5ty9u9MxQncyYrFK5xe4KM9suZw5c3?=
 =?iso-8859-1?Q?EnCIQz+I1vaXO6UcZFisD60ftrJOvVdVuTu1CGPKB1rfCfguwujUXvNw9h?=
 =?iso-8859-1?Q?eRNrt642au93hmaUTU91hiF5t1nxPjv46zpSdz0XAQmnlu7BgaUEWc0/db?=
 =?iso-8859-1?Q?EA8210i3uiT2na37A1qVHMx0CPCP4/CwLcBHWSRKxWkZIOlswFJLr8ZVAf?=
 =?iso-8859-1?Q?o4860rz04DFvRlbnWiAfiQpPeuHKZj01Wtw32qgZ+qw7o3psTPl2fgfQ?=
 =?iso-8859-1?Q?=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: e9190190-9b66-443f-8a15-08dc27512978
X-MS-Exchange-CrossTenant-AuthSource: CY5PR11MB6139.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 20:21:12.2834
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Isb5Vv4e1R1UhsGDjxYW+vNg//oUMohkbh6/91gtzu9r9jOhizjqRnt5kgQJ5J4uJK3F9NrhEvuuJzy+qM5pNOMEBzzUJrxXlx17LVqqTjE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7617
X-OriginatorOrg: intel.com

On Tue, Feb 06, 2024 at 01:39:28PM +0100, Thomas Hellstr?m wrote:
>Hi
>
>On Tue, 2024-02-06 at 12:28 +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the drm-misc tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>>
>> Caused by commit
>>
>> ? a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
>>
>> interacting with commit
>>
>> ? dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
>>
>> (and maybe others) from Linus' tree (v6.8-rc1).
>>
>> I have applied the following merge fix patch for today.? This makes
>> it build,
>> but more is likely needed ...
>
>There was a manual fixup for the drm-misc-next merge into drm-tip that
>did the right thing here.
>
>How do we ensure these are included into the linux-next builds?

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=rerere-cache&id=c39c6e3d74203820ef630884a5323237696bd36c


Lucas De Marchi