From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 2AE3B37F33C for ; Tue, 25 Aug 2026 20:05:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787688327; cv=none; b=m7rRzN0CcKS9UafB9lN11EyoQcclVsROcJrKNwtdbyKSVKjqOOotJLW4D8LA7NFhWJbaGxlQiQukbFdNvXFv1JGa3trlYYFJYxyBJqiIOqKrfznw0ubyzp6XB4p6I7AxcHLsYyqfO2guhyKL41/b7NE2lAhRdRcjBItTUNBA2Vs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787688327; c=relaxed/simple; bh=Oajh0/opPSLg5NGjwHnPj27JcFyA8vfrgHT+LbAaHas=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZvZ921JO0Lg/bnmtxk2QJNvkBBjnzhtK4yzHLLkk7jDo4iHmRK4wrrN2XM+B+QLnJebOV/xomB+Jk7FkWhA0uRMm3EEo80wSzk6M/x0wXjsyC/L7wVsdQUODObM2AjqFYZNZNuYOp7lHvEhcS5jgxTU27HlHrpGrCQKg0jy0Qdw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mBeVkO0o; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mBeVkO0o" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 962721F000E9; Tue, 25 Aug 2026 20:05:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787688325; bh=yNosoP9icGAQejdQRVYDZ0dzT4ZrLZVV95SUnsBvBtI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mBeVkO0ohShlSLF7E8ETth6ZXrKBCWEcFnqgRYgC1UhtwRI94TTHy+GEn2KQQ00La UFPtDykjFb6RkNEpJ7JoO/ZACMLD5KmdvUQmkfeBAnPgMOIvh8Sfqet31vkEn5Lukc dnb7xzi7aS4TnjYJCEDakbRrrxnDIxPEyVuF3b2PXg+SQcC4y1KcfoRSG4RKUfxrHB SoDDfWZM7rqCTdZBlKovU+nIzPD+ef3dKW7c6GvkKT1uLpNJdMzmOOW1rQQSz4VGU0 kngBN+VG1sxWGunq48BJefTt9ZcoDRYTEJsrU9WaF4PtAjyxs44OA21W0xTBIDd0nG NQ8ovYWYxYsrA== From: Miguel Ojeda To: gregkh@linuxfoundation.org Cc: akpm@linux-foundation.org, arnd@arndb.de, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org Subject: Re: [GIT PULL] Char/Misc/IIO driver driver updates for 7.3-rc1 Date: Tue, 25 Aug 2026 22:05:16 +0200 Message-ID: <20260825200516.42078-1-ojeda@kernel.org> In-Reply-To: <2026082525-spoils-gutless-f1ff@gregkh> References: <2026082525-spoils-gutless-f1ff@gregkh> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit On Tue, 25 Aug 2026 13:15:35 +0200 Greg KH wrote: > > On Tue, Aug 25, 2026 at 01:14:22PM +0200, Greg KH wrote: > > > > All of these have been in linux-next for a while, with the only reported > > issues being some major merge conflicts. Miguel pointed out some of > > these with the Rust tree merge, which is the majority of them. I'll > > follow up with a diffstat of the merge resolution I made against your > > most recent tree, which works for me. > > And here below is my merge resolution. Watchout for the > drivers/android/binder/netlink.rs fixup that is needed to get things to > build properly. It's not a merge conflict, but still is required due to > the module ownership changes coming from the rust tree. Looks good to me -- I did it on my side and I also checked that it matches what we have in linux-next. The only difference is that here: + LockClassKey, // + }, // + types::Opaque, // we can already remove the `//` in the middle, i.e. + LockClassKey, // + }, + types::Opaque, // Thanks! Cheers, Miguel