Received-SPF: pass (google.com: domain of linux-kernel+bounces-88896-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Fri, 1 Mar 2024 12:17:01 -0600
From: Lucas De Marchi <lucas.demarchi@intel.com>
To: Paolo Bonzini <pbonzini@redhat.com>
CC: Stephen Rothwell <sfr@canb.auug.org.au>, Oded Gabbay <ogabbay@kernel.org>,
	Thomas =?utf-8?Q?Hellstr=C3=B6m?= <thomas.hellstrom@linux.intel.com>, "DRM XE
 List" <intel-xe@lists.freedesktop.org>, KVM <kvm@vger.kernel.org>, "Linux
 Kernel Mailing List" <linux-kernel@vger.kernel.org>, Linux Next Mailing List
	<linux-next@vger.kernel.org>, Yury Norov <yury.norov@gmail.com>
Subject: Re: linux-next: manual merge of the kvm tree with the drm-xe tree
Message-ID: <55pdgbv7ltrwnewhxz7ivugowczzomlm6yvco2nxfanxm4ffco@olkrf4wr65so>
References: <20240222145842.1714b195@canb.auug.org.au>
 <CABgObfaDQMxj9CZBzea+=1fcFQXEemAJoH5Jvc9+tfiC7NAvrQ@mail.gmail.com>
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CABgObfaDQMxj9CZBzea+=1fcFQXEemAJoH5Jvc9+tfiC7NAvrQ@mail.gmail.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b1lRUzVLaUxSVGdKZU91R0NPVVhTczN4UVZBaUd6dFc1b0U4MzVYb2NQVkJM?=
 =?utf-8?B?YUhlUGgwaUVyMVdoeDgzN1VBVW5EeFBERHFmZS92Z1hQcFV1eklQdlFVSklR?=
 =?utf-8?B?RUt4Yzh3ZzFlVzJ5dFg2RkN5RkllTGJCNFhwWjY4NVlCQ3VieVJpUEpIOVdr?=
 =?utf-8?B?QnlqWkN6c2hqZytFcUx5VkNDd1NzS3FtNnNnNjUwczVocklvRmNaRHNFbisy?=
 =?utf-8?B?WVlJNHIxWXRnajZuaXJzNGhkRHNLYVJ6dUp5MDUxczR2WlZxYWE1cFV3eE1R?=
 =?utf-8?B?OTltKzVNbnRPa3BKSHlOQXF6MmhieDRrY203YWQ5WjJCMjlxRHdkL0NhZEhh?=
 =?utf-8?B?WjRjRlVGaHVLWTg5cWtjRmpIdzB3OFg1bTlVK2lYUS9pOXJrRmdqZUhIOGtV?=
 =?utf-8?B?eG9XY1ZNdTk5OTRWSFpjZDNINForWkNobzhvbzIvZ2pzUmFiOFFsL3VGaDEr?=
 =?utf-8?B?Ulk3cTU1VXpVaHRlZi9iZEVtSzdNVXBEbDc2OEE3SzB6TmZTZGl0c1daZDBP?=
 =?utf-8?B?WGs5QnZsc2FxUllNL0xGeHBZWndPVHhwU0lwY1JDN0ErdHdmR1QzV2cwYWxo?=
 =?utf-8?B?aVdHNktLaGxzSmdyNzJmbjEwYWtVS2lpWng1d20xVFozNG9lVE02ZnJ6TzlB?=
 =?utf-8?B?R0h2SVVWMkRETE9aQlB0MERhQTkwMXN3eTkwOGc1cThGdk01bE5RZ1RjbnZh?=
 =?utf-8?B?RE84OGJGMk45NVRYV2VIVVlmU285Qk45alU5N2NNM0g3NndLeWVJSkZxY1ZU?=
 =?utf-8?B?ZG01aVYrN1NXZ2lFTEdET0gzdzZKWnZ6ajdKVzVmalBXaDNJblFuNy9SNklP?=
 =?utf-8?B?OVBMWVc2SXc3ajBJZjRmeEk4a1NFbE9ZQmdXbnhYMFJXYjRKV2NwUGZnd3Zv?=
 =?utf-8?B?Mk50ZklnY2FIODQrVVZ1MlozUEYvakt0Q2xZSmQ0RE1UZkJjMnNpM1MyTysz?=
 =?utf-8?B?dnJvQktrV1BablJaV0xoZ1VkMGtXRHlNbXVQeVVWUzhIWTAyNmJiaFlmcFAz?=
 =?utf-8?B?RGZ6RzFmSmtQaGkzcnN5THNNd2RYUUlJUitOUW90SDAzQjk3eHRzVHl6N2tz?=
 =?utf-8?B?a0ZmMERvdGVnYzJUVDFvaG5CY0RIdFZJTHF6c1IwUjhSNTY4dXJ6NDRSUzJC?=
 =?utf-8?B?MkRIWHpxMlhUNzF0amJtdEJTY0t3WkN1RVFwczNEL0VJTGlvMnUwOHFUT0Ur?=
 =?utf-8?B?WWIvbmJhMHpCRjZmeGhpMkNvWWQ5VDdjQklRVE9SR2lhR1hpNnU2SXN2R1gx?=
 =?utf-8?B?OENRRmtENlpBN3VwQ0tCb2pZQytjRnh2VjV4ZlJ2TUFXWkhDU3NBenBqZkRU?=
 =?utf-8?B?Z1Znb3ZvVkJFbnU5WS95OFRQVXRJSHYwM3lTaWM3UmRlb1g5dW9PSmVsRlRX?=
 =?utf-8?B?UHNCaitCckxHazFuT2tjWEZSeVJ5YmtTWno4V3haQlpQRFhrMXREVFVVcVZv?=
 =?utf-8?B?ZGdCU0dYYmdGYXJzdUNNeXBUYnFxa1hSWk9ET0ZDUVA4RnlpWW95SUhMdVJr?=
 =?utf-8?B?bHg1VkRnZkxVaUxTeXN3ZXp1aHo1dmd5eFJvUWdqZ0RiOWJmS0pCSUU3MkZT?=
 =?utf-8?B?M25VL2UvVDRLbGZmN2ZQMUtSWUdQUGgvdXhVOFB6ZitZZU85b0RhRWwwaFFn?=
 =?utf-8?B?YzE3U2IvOXNDNDNta3lEYmJmd2Yzbmw1SGU0RHFtaXZKdml5ck80SHJhWjgz?=
 =?utf-8?B?VmRDOWdLaGlvN21HanVXci9VV1ByQ2haeFlLRHJ0bWwxMmlDbStYNitwR0Vn?=
 =?utf-8?B?NEJ1VTVwak5QQ3FNUHVlN2xTcnhuOVNJQ1BrVjZRQmJjakNuNzhuUW1IQmJx?=
 =?utf-8?B?d2ttMitLM3J0ay9VQndMVURkSTg3cjhnbUNiTFZIYzFJZngrcDlOUWJKYVRy?=
 =?utf-8?B?YjRZRmdYbFNnUHVnVFI1U3dnMGVRcTd3TkhsVGhnLzNpQXlsWjBsYUE1TUps?=
 =?utf-8?B?VVpXVG9haXUvK2tHTnVUMzdLZWhOeTZhTnlIYVRmNko2aXJ0RElVelp3QWph?=
 =?utf-8?B?UXUrRHhUYmdqcC9XQzh6bU5ERGlqTmlxMG9HVTJYTG81elNTRGlPSjhDMHhQ?=
 =?utf-8?B?aDBjeE1NVFRSTjlDL1dmNnQwMjVYeVFLVnl5SkZQcXo1Tm5zM1FNekp2U3V2?=
 =?utf-8?B?eEY1Wmp6SHE0V2xTTk9EWVlhdnduT2FobEd4ZEZMTGFtWDRDdytSbktqazNs?=
 =?utf-8?B?aWc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 3470142f-99ab-40d6-448a-08dc3a1bcc01
X-MS-Exchange-CrossTenant-AuthSource: CY5PR11MB6139.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2024 18:17:04.2709
 (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: jjrPqbrSi5gQBfPMqaY4W1UobTHPXLfRYJqgnd5eJFyEgF2p4X0pBFOLIF9GrUNMHs0aP40gNmW2Gow4n4jeJzbiSnyqhS883wnAxyXjgsI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6523
X-OriginatorOrg: intel.com

On Thu, Feb 22, 2024 at 11:42:01AM +0100, Paolo Bonzini wrote:
>On Thu, Feb 22, 2024 at 4:58 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> 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.
>
>Lucas, Oded, Thomas,
>
>do you have a topic branch that I can merge?

Yury set up a new tree and the patch we had in drm-xe-next will
(eventually) go through that tree.  We also had some issues with those
patches, so they are currently on the back burner. Current discussion
going on at https://lore.kernel.org/intel-xe/20240208074521.577076-1-lucas.demarchi@intel.com/T/#mc0d83438c5b6164eabea85bb3b5eef7503dade84

I'm surprised to see 3c7a8e190bc5 ("uapi: introduce uapi-friendly macros
for GENMASK") with no acks from maintainer though. Btw, aren't you
missing some includes in include/uapi/linux/bits.h?

thanks
Lucas De Marchi

>
>Paolo
>