From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (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 A0AAD3446CB for ; Mon, 13 Jul 2026 15:15:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783955739; cv=none; b=MYOq7nTX8kVZDPyvOoxnVOCg4jmEpfiBveq4rSU3zH2hxUnZwSr1eL/1SzFL1NvTuZk5KxLov4RnqUDijzFRmoj2hIoIGQ8gtwAt81xwGmuZXdfMpuNAmHgaFQq/rGyBnyGNxCoaSnBK4L3o7x/wKeLBjMZ/ggzkOZ3BBi3MnLI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783955739; c=relaxed/simple; bh=/hCY3H52sp5ZVSf78lSjVRCJcgGTxcgfHBCYbMbUX6g=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=emM46Ph/TJ2c0ikP1P1WzUvYh88uIOw7ln4lg0pT8vGeBVAoVfVjMyploGDYy/CjoZOdwIR8LkLFV0p8iF2obNgvnRe40iT4rVe0rOPFAn5XGm2KhtFiT/kVjBhPdBuJkB/GgLjIKlXnJfzBu/HlyLNIBModOO+u/b00oGAKjcM= 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=AF5Tob2D; arc=none smtp.client-ip=209.85.221.46 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="AF5Tob2D" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-476a130c138so3931912f8f.0 for ; Mon, 13 Jul 2026 08:15:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1783955736; x=1784560536; 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=CtL/f8t6NPvAS6gQ8uhvbIDoCCzs9e/+wWkWy4PvZWY=; b=AF5Tob2D42nJO/3AvYFJLPTGMkbl7qpZMy78nTjQqr9kIF9a70jTNabi/fFJ5e0VaF DqcKL95ghZtLIm4NifBk5n5382fD/+r/K9wuwDG5Lv9+xK57yHmizHHUtTZX5RQMQLQ2 hlOv06TKbfnePhbY1622Jz/OBhnoIDyBsMyU82nTac2NFQbGFtuxjyc+mNlvYfmd8Z6m /NcR6iS93VeDHihSkD6EJB1LfoiipDe5O5cjFUM+5wGUzn/QwxrHQGPPgOc3D+in7Jzy OxP1pkjojJ18/EkRtnhve4DHN3EsJRwlUPVwgZDC6GvE6yoxS0hk0BCWm6DwwpulS5hr /3Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783955736; x=1784560536; 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=CtL/f8t6NPvAS6gQ8uhvbIDoCCzs9e/+wWkWy4PvZWY=; b=DK/zaC5wxvgEVD0zBFKfutnabi6iu0wi53Vz/NeSoEpnv9CR2w2nunmZTxkwLiuj5I N76e3xJnKV//Cb+ZYMIYUjadfHUHVOjD7F1UcyZ2CxQydMmfaQz2okIIU/XdjGjRszWn WNZp2XQbe8xVpga7SGT9H/Rk3sDSn9OP7JjtyWr7aSowA14tgDh8XAStuA8TnI7b9J3v IwxDXzYA4FbVIxj1cBABwB9jOBMOTjDuaMYAcApJYCK6nIKdoK5jM5zyFlKCQ/RhiCwn 2A7PtVPOiS+OOPEobuUJEI+91XbXp9tH5r8lKHp9Mdtw9dGn/Fi8fNceqcWqVKVIw3x3 bkAw== X-Forwarded-Encrypted: i=1; AHgh+RrvWx+MRGO1BgIhvKFmNn3xavu28jG3PsfdS1P0IymT7q7ldS2vXAEUY2CsDOc7jECeh/W1/YR0xbNNJPw=@vger.kernel.org X-Gm-Message-State: AOJu0YyqEYaVZY13/ueILOMDnEpssmX933bKkDop/RRs+xFx8Wg+eZzU VY+61RB9qEA+nz5kSjVXGepNhzZ8bds7ViO72jocfu7QetdHZCdOZj2AX9iOio+gzBRYUTPNFXi nycQk X-Gm-Gg: AfdE7cmZYNITM6OIxDZKwE+PFrHEG1PmBYxojFUT696+RkeL1S0wW92zzY5Wne1cVoB f2sZbRub80HuKwTyCG+C1xA+5Ss9jxvQCc/YzG+50FXHmhoDhss0Kb+WjqCuPp6+Yf3qelIOSmQ zXPDl9SSwWVGyvg3H5eOCzW931HJF6m+DJp+PsMRrohkNlBDaE6IseyjomQGu7G3D9Ma4ozt4A/ N2SUamcbdqTZSIkdXZahP/tEzTYXK1AZL8+WvTINVrXE8BfPBgQvcHVt5KUtDuuR2eEqyyjl8AH sX5c/WWAkI9F/VieoUzKflYsEOsD6bluyv//bGE8Nef85hEx2CustWJa6VxbR1mBdff466CKgEt 9aSGxOIiN7GM+2EyAH/BrPc3pb/HKK6LEjD7RGWVw4HJNM6d1UDiiOT70v6aw3RMSMRBw2CmFPD 646VYjNBXR0JBt+QOOH1HRLv/9ITqureUjY/3buMblm/nXj7SomXyhnE0XoY4kTPXrK/AdNR8CI 7gSf0N6CSNbctQ= X-Received: by 2002:a5d:5d12:0:b0:47d:e0da:fe71 with SMTP id ffacd0b85a97d-47f2dcd1a01mr10475362f8f.7.1783955735985; Mon, 13 Jul 2026 08:15:35 -0700 (PDT) Received: from localhost (p200300f65f47db04916e789240f263e3.dip0.t-ipconnect.de. [2003:f6:5f47:db04:916e:7892:40f2:63e3]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-47f4635a940sm68849f8f.12.2026.07.13.08.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2026 08:15:35 -0700 (PDT) Date: Mon, 13 Jul 2026 17:15:34 +0200 From: Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= To: Mark Brown Cc: Greg KH , Danilo Krummrich , "Rafael J. Wysocki" , Bartosz Golaszewski , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the driver-core tree with the origin 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="l3updf2tp6sxrutv" Content-Disposition: inline In-Reply-To: --l3updf2tp6sxrutv 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 driver-core tree with the origin tree MIME-Version: 1.0 Hello, On Mon, Jul 13, 2026 at 03:07:33PM +0100, Mark Brown wrote: > Hi all, >=20 > Today's linux-next merge of the driver-core tree got a conflict in: >=20 > include/linux/platform_device.h >=20 > between commit: >=20 > 00cd8fc630e06 ("driver core: platform: Include header for struct platfo= rm_device_id") >=20 > from the origin tree and commits: >=20 > 714cfe9e143fe ("driver core: platform: provide platform_device_set_of_n= ode()") > 8877c06885ce4 ("driver core: platform: provide platform_device_set_fwno= de()") >=20 > from the driver-core 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 include/linux/platform_device.h > index 8c566f09d04ef,94b8d2b46e913..0000000000000 > --- a/include/linux/platform_device.h > +++ b/include/linux/platform_device.h > @@@ -19,6 -18,9 +19,8 @@@ > struct irq_affinity; > struct mfd_cell; > struct property_entry; > -struct platform_device_id; > + struct device_node; > + struct fwnode_handle; > =20 > struct platform_device { > const char *name; That looks right, thank you Best regards Uwe --l3updf2tp6sxrutv Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEP4GsaTp6HlmJrf7Tj4D7WH0S/k4FAmpVARQACgkQj4D7WH0S /k5vwAf/dCiTIPt+Usb8AJ4+7VyjJVLZz5nRjENoxXaBV/j5kgteeRhLTffUp9tp Byfl+64YU4CtqSE1ssmbrg9DMomO87KqXU9Vq523j1Vau6pK4q9AVTvDlYZlj7/t ICn/B2F2CbCrTaOwRdTp/1VlNhR8tvRua8XdPgA2HNBsMCYiS8uD3W3PABCOByWo DfzC9z0FrSAO8d8auz657kX2JpnBOXeTgbickjFDm1TouyRMIwu5IdGGJdQLqEZ0 8S9fItyS20r8d36XaedyRlOvdqSMqSj41c82ScsnLZnQJP9/2/67IJfC/hfBexRF t1IS1CLdQ9izW9okEyhMB507kSfHSQ== =TyGK -----END PGP SIGNATURE----- --l3updf2tp6sxrutv--