From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) (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 54BADDF76 for ; Mon, 22 Sep 2025 14:59:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758553163; cv=none; b=NK2DffYMREcnZdF4bvv1z2P505fs/CANsRIZJ8ZmJ9rfkE9LaBYRn4DbFv6Ym98Jbuu8zb8N5LIpDDxl6cxm/TiQ34jzBXgiQcS5n/tDNGE1EGZc+05CpG9s4TY9yf13R03JEd/qJDEL436XryxDVUb09u2cjcrur6rGy7N9EWU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758553163; c=relaxed/simple; bh=1PWtNxvRKbxFPDWc9oK0CqU7hLHwacSNSy72ep3P5sQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=aiDB/Qj/b85/3Un7CJQMrRAlo7qw55qGBaTnUYaw2g/bTHiWsLW8Ugs8kZeLWPmfzJd0bw5O1r1WP6JTAeRzD9g2I+NcqaJvXTwA0zp24wlbnt1AA71S5J3LWj0mmFZcEUTRsNSvg9NecqZG83QJ66m6EBYKhFOlfyOGBba0TkU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cVpiq3fk; arc=none smtp.client-ip=209.85.160.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cVpiq3fk" Received: by mail-qt1-f171.google.com with SMTP id d75a77b69052e-4b38d4de6d9so28385561cf.1 for ; Mon, 22 Sep 2025 07:59:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758553161; x=1759157961; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:feedback-id:from:to:cc:subject:date :message-id:reply-to; bh=iv0y47723YQXj23skGg2jVTBDdISRK9/QZECA8mOZh8=; b=cVpiq3fk2EyvXZXXgHDDak17DkvDlCfBEKfR/qrn0vfDcnJrOOHSvU7mw0Di+wB3t2 02yE7EzdK/btaVxBBkMLKSI4JpTmteVY0T7EiPBLu+0XoIzJOlec1PnOo6VxRv235WRB jd7QD1yZlr66h2eZUt5sgTEAYd0zTJO6kkii8F0wJQVv6YVix1y3SlEoyk6xzb6wnLhj HS8Aen2nEqIP5NDUNCMVugp6SS13DlI6zJ1Al95cALM0CvkObuCJc/4bK4i956duCDEf WbFLrZW9mejXs5DI/xrvChC6NoED+4XEddViM51T7/LISXGeY2X6Jma/cJQYHv6QueUt RCyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758553161; x=1759157961; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:feedback-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iv0y47723YQXj23skGg2jVTBDdISRK9/QZECA8mOZh8=; b=YJpk61s9RFmMeSuhB9B3JVmgIN66OrdS5QPXedfNrcIDWvke49iQnbd3XnJ2yYXJkl eckqOKlmQG4O8/RFLvmAOLYsrcWMl4tHVez2iodQRPXajJv0s+16ntVdmLUThuyCdZ67 h6ciyGmnXW4MxiJnD9FjxTVzRWfKeLklCcRGNp6Zy443WITR9oleHV8KLcP55gav51dw /MKE2LvNA5kofTfs63DCoTLyhp1Qu/f8Mcgtpr8YdU8ZBnNC4lRm0X6MFdwdoWPlxN9k CYZKshn7C6WIFccbiIO86cPMWtqwMD2GFUgHzsoBxqFqgKEsFSDwDNecrvzy1Q78djWp MzZw== X-Forwarded-Encrypted: i=1; AJvYcCUXbHRRcBUswnGbQEFiZDktzPX3JJRTTDIMnjdl7t+QcwUtVhdmdp/WivX5lY8yfIH5tlCO3MwADyCI@vger.kernel.org X-Gm-Message-State: AOJu0YwLLPPFbKPmRLsx1wyBbSv2VYJfvleokBjHdQ9cgHKBLwUhIQfr NCHkS6ljsyFQW8qHndZ4uGlM0RkTo+tR5rzPq8B4fgBdB6pk3gK4yZ58 X-Gm-Gg: ASbGncsGAeq6Ti+phl7MylXbnbL18wvhZyrNjPrEq7ETjhdHcYDQp3V178FOFvtJkze sa3BrL3iDrvWBusx00r5098H+TzjR2o1Rwz/YOLk7zk7F+0ffNYRRngEGYPcjc0I4LggMe51zs9 F+6UvLzgMqtcjzcyB7IYcXobOMzAcDsxWbwLzdMadj63NvdNm76NYaiITphr4XKojwWCaw+bujx Ewu4YsO+l1eabQOgfyJCPB4Z+Z7B7+FqgfPCzi5VPfWeov1vVG3VT2b0SvLORLYInLUY9c5cWUE eJCQs9YJWeofks3nHbuXgRddBRjZ+mbo8k/0SVpXxcfmzNExIJKVKWlFih4k9tLBFFdQ3W7V4kt UoQVNwXl5Tc1FdKSqdISOcJU1jwt3DUoCpSOyEpCyfCkXlExPW7cO3TsV/A2r8oCa0EkzE8Tmza 54uhIrHxPlLC6G X-Google-Smtp-Source: AGHT+IEppR8/BUusJrUkpOVDQuWIM8gn11kIQwj9+wklEJaFajMHL4d80hJEztBz/owxkkx25oVhlQ== X-Received: by 2002:a05:622a:420b:b0:4b5:4874:4f95 with SMTP id d75a77b69052e-4c073106965mr117448841cf.51.1758553161139; Mon, 22 Sep 2025 07:59:21 -0700 (PDT) Received: from fauth-a2-smtp.messagingengine.com (fauth-a2-smtp.messagingengine.com. [103.168.172.201]) by smtp.gmail.com with ESMTPSA id af79cd13be357-84bc62df395sm150933285a.40.2025.09.22.07.59.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Sep 2025 07:59:20 -0700 (PDT) Received: from phl-compute-02.internal (phl-compute-02.internal [10.202.2.42]) by mailfauth.phl.internal (Postfix) with ESMTP id 2D5EAF40066; Mon, 22 Sep 2025 10:59:20 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-02.internal (MEProxy); Mon, 22 Sep 2025 10:59:20 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggdehkeduhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpeffhffvvefukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpeeuohhquhhnucfh vghnghcuoegsohhquhhnrdhfvghnghesghhmrghilhdrtghomheqnecuggftrfgrthhtvg hrnhephedugfduffffteeutddvheeuveelvdfhleelieevtdeguefhgeeuveeiudffiedv necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepsghoqh hunhdomhgvshhmthhprghuthhhphgvrhhsohhnrghlihhthidqieelvdeghedtieegqddu jeejkeehheehvddqsghoqhhunhdrfhgvnhhgpeepghhmrghilhdrtghomhesfhhigihmvg drnhgrmhgvpdhnsggprhgtphhtthhopeduuddpmhhouggvpehsmhhtphhouhhtpdhrtghp thhtohepsghrohhonhhivgeskhgvrhhnvghlrdhorhhgpdhrtghpthhtohepghhrvghgse hkrhhorghhrdgtohhmpdhrtghpthhtoheprghrnhgusegrrhhnuggsrdguvgdprhgtphht thhopegrlhhitggvrhihhhhlsehgohhoghhlvgdrtghomhdprhgtphhtthhopehgrhgvgh hkhheslhhinhhugihfohhunhgurghtihhonhdrohhrghdprhgtphhtthhopehlihhnuhig qdhkvghrnhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehlihhnuh igqdhnvgigthesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehmrghtthhg ihhlsghrihguvgesghhoohhglhgvrdgtohhmpdhrtghpthhtohepphgvthgvrhiisehinh hfrhgruggvrggurdhorhhg X-ME-Proxy: Feedback-ID: iad51458e:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 22 Sep 2025 10:59:19 -0400 (EDT) Date: Mon, 22 Sep 2025 07:59:18 -0700 From: Boqun Feng To: Mark Brown Cc: Greg KH , Arnd Bergmann , Alice Ryhl , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Matt Gilbride , Peter Zijlstra , Wedson Almeida Filho Subject: Re: linux-next: manual merge of the char-misc tree with the tip tree Message-ID: References: Precedence: bulk X-Mailing-List: linux-next@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 Mon, Sep 22, 2025 at 10:56:40AM +0100, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > rust/helpers/helpers.c > > between commit: > > d9ea5a41cef80 ("rust: sync: Add memory barriers") > > from the tip tree and commit: > > eafedbc7c050c ("rust_binder: add Rust Binder driver") > > 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 rust/helpers/helpers.c > index 1c6096f53a6fe,8e8277bdddcae..0000000000000 > --- a/rust/helpers/helpers.c > +++ b/rust/helpers/helpers.c > @@@ -7,9 -7,8 +7,10 @@@ > * Sorted alphabetically. > */ > > +#include "atomic.c" > #include "auxiliary.c" > +#include "barrier.c" > + #include "binder.c" > #include "blk.c" > #include "bug.c" > #include "build_assert.c" LGTM, thanks! Regards, Boqun