From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0072D31A07F for ; Tue, 11 Aug 2026 16:22:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786465341; cv=none; b=l+E2pr7+TLIFaKLaegAuF/M8yICG1KVasYNNJ86xyZ70H+2eB1qANotrKZhgGljZmWZppUi2U99OASW0U3k5UFlyqKKTat/YSRp+wYuq+UYpvkLgGZME/R+9+SVUsN9slTyuyLP0tSKhpk1bTTZGrlETVVH7JcchU0JZ0us5RBs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786465341; c=relaxed/simple; bh=M01jVocE+wh8QVq8SkqCrDJBc2gtK8S2LUO2prZxzAM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=XVDCpWWUzncBh9VMWaJ4WZQM3KWV5V0AXvKPRUoMjN1iiWeoziqnXqVcZySVKNDcdrGzGJ4ZWWNpb9dBQhhomgwS3tj5EtZrqghS/tlaebS31EcEODuXblJvSEdkmuG1msxg98s4QoeNOrA8II0yVxda5112Qbvh/DcdPQlxV2E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=LWRUG/wb; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="LWRUG/wb" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2cacef7d299so120705ad.1 for ; Tue, 11 Aug 2026 09:22:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786465339; x=1787070139; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=GvR7bqwYYWMLIGJXI3Fulc6th37mQoSz7Zqx7w5XSQo=; b=LWRUG/wbYSnCjlipyQbSGwsDBSNBYId+gxX6HymaMnwuGrcQrvmZzMT03Rson8GAjD BvOSxuDqOW7Q6HgexFzE/rRpv742XI71P3bruBRbrHE4ZGfLlMdaqWtkFGRmgHBR0VXL lGovnsgXuIbd2+xKeXuP2virV19mws+t4R4q7DFJG0mo1XAU3MhoP74ioPYDQEGBS0PB ils4eePVdJdT3LSw6EHpOwYs+XcUu4LoABfbQjzWBFMg2I4kxx/+T8NzoW3Mvw8XRZU1 7pZFa4hBjyLL1O6g/a0DpGksNqGG2fVjprMfNN7e3DXugtQIKmGY9Go+WNKxwxudiMT6 0YuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786465339; x=1787070139; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=GvR7bqwYYWMLIGJXI3Fulc6th37mQoSz7Zqx7w5XSQo=; b=Uf+5YqpyzjDR2EB1EehUfRF2VUYja5NdX6zpTM5tLV4umORAoUTE9Mv/MsYjfyIAnC mjZLJUejtAkie8eHfRYZ207kSrLKQxkMwjn5r4Q5jn6qxOma2/nDJjr4hbc1vXIjFjmU OENDI9G5qG2E/agRz+/IySuXvkpHN6RkElF2R0CM5FD0YmOBlNEg4lGCu/hcPUlRZqZD IsckbhEprwTfj0hf9JqNKBKI2X6L7YKVzyPW6XbDaFiUfgk2vAVQmlTkMigPc8aA7HDb Vuu2kNYPYsAO8BjHfBEZCL6CVqPZir4rlFYMAyKmrp9wRQTLGOcmUSdpojwKyaqc6ale dOLg== X-Forwarded-Encrypted: i=1; AHgh+RqGA92Pc113xpMer2oUAA+Bf6mnJLa+grayqiLXtZPHEIYvDFqemLLnzH5efxqf9tdsXUr5lK5Ox5OCwRg=@vger.kernel.org X-Gm-Message-State: AOJu0Yz6dfvrM9ySTZ9LSxgueAMsnbKOnf1YGbo3Cul4HIBVbOyuI3CP bWDyS7ifKXCNg6TnaGYiCFPrMAdEkBSt5JIO/uVhghhL5L2bysrvEiiuuJagyOyPtA== X-Gm-Gg: AR+sD10k7vInbebSDIil3ZsAXQwyLfTq/88qwJ/Kw3culB5OcROYrJKM1fofvIvVFxt EYMg07dAtIt/emOlUgL58KHlaflpYi7pANm0DmVtEG1JwLNDD7JDVOp8C3p9nRM3olh5aXFSg0F vk5+8sdmFX7/UMSVMCbCMgJre8237Rpcn+9fwGyH0JpohlsCReF2lDg29kwKyGXyzySLxPb6ymn iKuJNq89wCeESCNTKYazM92fWU9zJvP8oSoZkjQ1E8p9I5BNPmqEqeVIEy2oM8Ox/9AGm5+HsQb AG2QDmyBnsH0MJNRsn/3iAh6M82v4/zWi2YgYKAEfrnS7Jtr90ZUInDuECd7N4GddgsqUw/ZAHI Sw8mvbqgvW/KHEoOLmaGIyND9VnpW3A16XRiXtP0GJwTBd/CA5w7MlqgeWhpCy9lSkaJ1E0lZJo Z4Z8fBw3qrIa2r5A2qtOHvVs3/MT6SuVIPQ5w6aKJbX/eQFPiQmC172F8+Cl2LqmgOlyAF/8NId qD+Ao4/Ca2rPzvZbulIAHhSl1e/U5RTtpf70sackCGLza/PQCwL7elE6OziEmGVM6umJ9SD6vF3 BcTbd/o= X-Received: by 2002:a17:903:181:b0:2bf:1000:d3ac with SMTP id d9443c01a7336-2d31753ccaemr5360545ad.11.1786465338735; Tue, 11 Aug 2026 09:22:18 -0700 (PDT) Received: from google.com (193.67.125.34.bc.googleusercontent.com. [34.125.67.193]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-392f935fee4sm71663a91.8.2026.08.11.09.22.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2026 09:22:17 -0700 (PDT) Date: Tue, 11 Aug 2026 16:22:13 +0000 From: Carlos Llamas To: Mark Brown Cc: Greg KH , Arnd Bergmann , Alice Ryhl , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Miguel Ojeda , Mukesh Kumar Chaurasiya Subject: Re: linux-next: manual merge of the char-misc tree with the rust tree Message-ID: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Tue, Aug 11, 2026 at 04:15:34PM +0100, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > rust/uapi/uapi_helper.h > > between commit: > > cdfcaa36ac93a ("rust: uapi: replace direct asm-generic/ioctl.h include with linux/ioctl.h") > > from the rust tree and commit: > > f14e0c8183bc7 ("rust_binder: report netlink transactions") I don't think this commit touches the file mentioned below. Maybe the conflict was in rust/uapi/uapi_helper.h with the header includes? > > from the char-misc 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/uapi/linux/kvm.h > index 70e36e6a0ad4b,9fc8dfdfd65ff..0000000000000 > --- a/include/uapi/linux/kvm.h > +++ b/include/uapi/linux/kvm.h > @@@ -997,7 -997,7 +997,8 @@@ struct kvm_enable_cap > #define KVM_CAP_S390_KEYOP 247 > #define KVM_CAP_S390_VSIE_ESAMODE 248 > #define KVM_CAP_S390_HPAGE_2G 249 > -#define KVM_CAP_ARM_PMU_V3_STRICT 250 > +#define KVM_CAP_PPC_COMPAT_CAPS 250 > ++#define KVM_CAP_ARM_PMU_V3_STRICT 251 > > struct kvm_irq_routing_irqchip { > __u32 irqchip;