From patchwork Thu Feb 22 03:58:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13566751 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 1ECC3FBF2; Thu, 22 Feb 2024 03:58:51 +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=1708574335; cv=none; b=ibSjauyWTXjqWBcv2e3hUtLw2JtGHWVL9YTLSqF6TglxywmOwTsHxf9bKpkl2xXjkulN99RlPomMXi3QWjanVuteHK+mQf0RaeayCGPu2mH9poorUJz0tjWIRZKF9TtQxyqZEtSYga3Y05a86uc/XX8mHI2oFNbV7LvCgDSUhow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708574335; c=relaxed/simple; bh=+p4ZKVjWl5lZooQvNzTz/nwRMpvJy45X7Bqh4CNH1JA=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=JKcVg131PdR6XBcgZtS+gfq2XBmB99LPvJeL/QyVErB9PIFvixpTJmIRIwjrm3E+tL00gvmUcwhRlYSKiJfWq/VvZoj+4ZOy7C1N3YAIvyziPyNOhK2BIqvix5EidfqehNRR4vYs2R8U5dIm8XHs2DWY0e688BFEB4Nm2bVahkU= 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=WC+T892F; 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 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="WC+T892F" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1708574324; bh=emV0MkgJME9zlEcVVPyA53ouLSsHaJyiSI9ys/B7uzw=; h=Date:From:To:Cc:Subject:From; b=WC+T892FO1v5FRGYWML2pkV/JGvBkjWNxWHVFw0JaF4BykGV0Fjuce34YLjlQoXny N7E8w9PbFEvG9JFTT6AI2hdK9+G7/SmGTJupNoPidnfbqu9nWxxnATXDZKzBBMKCAT ImX8/ubTQq4a3IYmge6NHibJkGg7PIzrlEXW2STT49/82sAo7Oo+lA7+P1EjafmtU8 rGu53vaEr4N+nAezJMI8U5mT0//y2XLVuvWLnMD2/wwrqF8fD3gw5LjdAp26H0z2u8 lhF3HFv5uPW/XzICtrPX/hRwq1vZ3T1uSZ6R5JaQVden25O+CErPRlA5f6V1UcZoO6 wokwWE4QCBgZQ== 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 4TgKBW3gDPz4wb2; Thu, 22 Feb 2024 14:58:43 +1100 (AEDT) Date: Thu, 22 Feb 2024 14:58:42 +1100 From: Stephen Rothwell To: Paolo Bonzini , Lucas De Marchi , Oded Gabbay , Thomas =?utf-8?q?Hellstr=C3=B6m?= Cc: DRM XE List , KVM , Linux Kernel Mailing List , Linux Next Mailing List , Yury Norov Subject: linux-next: manual merge of the kvm tree with the drm-xe tree Message-ID: <20240222145842.1714b195@canb.auug.org.au> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, Today's linux-next merge of the kvm tree got a conflict in: include/linux/bits.h between commits: b77cb9640f1f ("bits: introduce fixed-type genmasks") 34b80df456ca ("bits: Introduce fixed-type BIT") from the drm-xe tree and commit: 3c7a8e190bc5 ("uapi: introduce uapi-friendly macros for GENMASK") from the kvm 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 include/linux/bits.h index 811846ce110e,0eb24d21aac2..000000000000 --- a/include/linux/bits.h