From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (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 00D7C360ECD for ; Wed, 1 Jul 2026 14:58:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782917903; cv=none; b=BLvwO08gJygvvB/fBvRpsp8mnU6rm4Mzz0GEHTkwF7go+TDZ3UkJ0xtDbcTg1uwrdPaE5joq/Y4T8gy396dYF7YhUHWhVNGCKexbqJoURFkmJ/3e1MSUPD6NFwM+q1LuyUlWmesy2dvCqRPY/wsnZuH6e64CcQXjWoxGcF9UAIg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782917903; c=relaxed/simple; bh=ZtUWCL8lfIV2ljqvjNUMKcFL8sk6Y7RwgRMnNLX95aU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=D/CYgT4ra1ziB0LShNA9qNo/6i6i2qLKgHhgXsI+AN5n4rm2yRQB7UJ8r822yx/Q5n2LsLnTPKh2uJWYv5JVyQ87lY/sxd9bhdWvhLDIlXFEEBDdUmZYXC9IMGcsadnDr9NtXdotlDTT0slsHrs5coaSA3cRGVBRsk4tL2PhEtI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b=NF1M3koo; arc=none smtp.client-ip=209.85.221.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b="NF1M3koo" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-47488efcf30so462997f8f.3 for ; Wed, 01 Jul 2026 07:58:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1782917899; x=1783522699; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=C/xwbuOxqJ/fXzCZ2Re77mlIFz/wcbLe+ceA9Bo0lKQ=; b=NF1M3koojPCntW5NgjO6PFNfZkNS7h3fGenWhqEG9e0Kzkg7Hq4Oxqy3u8qbTXH1gA yyYj16DoneUIbnJPrcQrgg/+S87aKsUFz658xrHgLl9hmfIlBxT2ySl2wX+lKbvUB8tm mcikEIagQ0/GJ6S9bd0XrJBxpZ17WZD7N5fO5wSYQT7MkiZBH072g5oRS6bcNhRqX1zf poIjjeW0LW4YTIeOEZOG6Lzwb5HknpTAm093wuNOAIa35yJ7iJO2q3COUy8zhb91TyLI sP083mTgwGPu5LAfBbEQ/3TBKk9+8DDjOtOZ7L3mEn5YVqy9AqDfO/cngx3CvXxLpF/t vPTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782917899; x=1783522699; h=in-reply-to:content-disposition: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; bh=C/xwbuOxqJ/fXzCZ2Re77mlIFz/wcbLe+ceA9Bo0lKQ=; b=UFsG+sfrOHrZgs3XzJKdmpah6deGFSex/uC/qdzWuUFepfYqxXD3HvRHjfYhQImOIe kOBk16qmHwx9Hqz+tdCEKNzxu7l78h7XVanFWjMdSD8clikZy4nEE3hKR852KSS5iSnR D4bIjGbwrXw9Arx4bslE4Ocu92QH8Jqs2Te/KTHJr4S/f0QxyMtTaRUtKV+QlxYdbHTC i+Kzzm5NiLXj+nG8dIgvw73oy+MJzHVdwyjP4c75/fwmdIQg4qywe6uMY3adxB/qjJsZ 3G/DGmwtHDY0wepRvteXx0AnZq6Ur2dNFoDwPwM2Rp8B/TLS069mKhfJ1+s5AEJ/NDIL 8dAQ== X-Gm-Message-State: AOJu0YykdgNbvOzXJ3fN6MEYGR2emLlyvO26YA4b1+aNHR2puz70WAzu rUFped656t+u+zsUkZTzKgRjeX4bq+4Pke971lwiWcQgwwl44HiIzirUWkQYiDGxjdM= X-Gm-Gg: AfdE7cnnTqBtG7cANkqikcpJXkQh2G8jOuBkiuZzP1Br4N2hDudBbfuPqzNhidxrSio EXfgE/7DR6s1lp9FkbsSBABVpbV8V4lxAzYZDjtOPkuvM1/W0ehSHc/wXlQb6/J8R4yr6HI/4Rx xC+XU+rRVacNXVxvJ/fINU0rLcaKzvKFwei8K4uFzQBrSN0wUrgG8kpBOs4BtFqLOFh9blbqwSs a/7NnbZrP34Es53/sC8q1NAR+XQKcvwh8WO77qQQvLNi6PZ7LV36+Iwr40BiVvQ8YQgINiGWfOv P/yzxiDtIPtVDzLZO8Ks12gdJi72BQGySItukB13ybvoShTpV13RgBiCiRbV0VB+KNe3sRXBVDR j6vEtwtOARdzIEcUSSuX4T0oRR+5jVjDxLvoNpXbWCEPOGBmfnnqgGMdEIfo9eNtQReUqvTPZJb 6p9gwa5BkOYUVSRJ+VR1iFVNmyJs9Y01TB7PEqPmcinWzZgQVHWzhCitdmqdURwB6wSc4vlQHS+ 1w= X-Received: by 2002:a05:600c:3489:b0:492:40df:d49c with SMTP id 5b1f17b1804b1-493c2b9063dmr32380215e9.23.1782917899164; Wed, 01 Jul 2026 07:58:19 -0700 (PDT) Received: from localhost (p200300f65f47db04834e9548038bf713.dip0.t-ipconnect.de. [2003:f6:5f47:db04:834e:9548:38b:f713]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-493c0e92687sm46459755e9.0.2026.07.01.07.58.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 07:58:18 -0700 (PDT) Date: Wed, 1 Jul 2026 16:58:17 +0200 From: Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= To: Mark Brown , Bartosz Golaszewski Cc: Linux Kernel Mailing List , Linux Next Mailing List , Viacheslav Bocharov Subject: Re: linux-next: manual merge of the device-id tree with the gpio 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: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ephwtmfzdbnaov6j" Content-Disposition: inline In-Reply-To: --ephwtmfzdbnaov6j Content-Type: text/plain; protected-headers=v1; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: Re: linux-next: manual merge of the device-id tree with the gpio tree MIME-Version: 1.0 Hello Mark, hello Bartosz, On Wed, Jul 01, 2026 at 03:35:29PM +0100, Mark Brown wrote: > Today's linux-next merge of the device-id tree got a conflict in: >=20 > drivers/gpio/gpio-shared-proxy.c >=20 > between commit: >=20 > 163ba8782d521 ("Replace by more specific (c files)") >=20 > from the device-id tree and commit: >=20 > efecde8a254d1 ("gpio: shared-proxy: always serialize with a sleeping mu= tex") >=20 > from the device-id tree. >=20 > 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. >=20 > diff --cc drivers/gpio/gpio-shared-proxy.c > index 10ca2ef77ef34,d3625b8d0ced2..0000000000000 > --- a/drivers/gpio/gpio-shared-proxy.c > +++ b/drivers/gpio/gpio-shared-proxy.c > @@@ -9,10 -9,7 +9,9 @@@ > #include > #include > #include > +#include > - #include > #include > +#include > #include > #include thanks to Mark for the notification, the merge resolution looks right. Bartosz, I intend to send the changes that are currently in the device-id branch to Linus for 7.2-rc2. So it's probably on you to notify Linus about the merge conflict. (Or you rebase on 7.2-rc2 until then.) Best regards Uwe --ephwtmfzdbnaov6j Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEP4GsaTp6HlmJrf7Tj4D7WH0S/k4FAmpFKwYACgkQj4D7WH0S /k6LOQf9FVs1QWiWN8ORrfiz7jIU3F6NfsFrCaI+Hf0wGPpBj0rRqHoonxwysEe4 IrtNlqqYUGX9G7WZ376vO34jWj23Vuw3/rQWeNG97jtnOdDxyZB09dkgMJ/Ni0tE 0geKuZ89u5/+RmGmi+7ciXmc7IWBOQM++AHR0B26xyi86cn7hJcsM8B7FqoLyIoi iOqlg1+XQOUPU4R7s/moyn7X2PlsonkWJ3I2QKU3u4XPe3AkknZEWdRW9R640r5U VtTibIUSCenCFlZTC6ZZTSE9nWcgWFulXLhYBWmmv3aaD52lOz4fODGvXuu4RCLw n5fvnTdJxEIVDdT7GEhMRIuvJqPdKA== =nu4n -----END PGP SIGNATURE----- --ephwtmfzdbnaov6j--