From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (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 A5C645680 for ; Thu, 15 Aug 2024 01:11:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723684273; cv=none; b=AWEdvn7OStwiwIbZ3K2E2RLCpoc5vKAwrzY1S7b76P6rJ4SxRrMnpnkiQUcDsEqgNAF5u98pRUiyIgMBGR5kAaKCj4lZ0PhV0U316xzk6ku1majbruUU+lsWMo1HKeCk1TBj3qzQ//eo/udf76CqaHsf67dWKipKD2WNbK4lhVI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723684273; c=relaxed/simple; bh=dcecRVPjLIngGI1RLxMq5/GH4z1JjDZM6eoc+0xvyc8=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nIl8MfceaasKMDaG5M/5uGfXwMCEsu3CNfXc6WQHUuKIHuZu6ozg4rW14210e+hiAy6zv9uaAtip9GrsKdXFMJ4xsFs+HKn6FPgOPKljHT9wpmAcfJ4ikl26JSznjwhd29RiR/ukIbPo2xQ9eyQdQqZ6Q7G85ryeIeEN/QiaBdM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=G6NBdMSE; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="G6NBdMSE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1723684270; bh=dqMqyY5BdvgE4KGngVIuwXBI5jdKPLu5bwHVc7uCeV8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=G6NBdMSEWv7wZh13H6FyFH6cv7wpTfSuvXCPo4Q/s8zrZKxA17GL8kvPT7nYTerE/ JOWpkg3b/vGBQbKwKHZInFWr107imDQa+8hxZyNL4f+LjrkeoKwSKx0SBoH9AGfR7U mPoK14C9czlUN5uQBFcOVEebmM/wDTOxk21jo7uSacPNBemyGtScWuwK9bs/3Jchi5 khOEFycDvu/2k0YIvPCroYl8rKlMY/ZJE9AQm0Tp8FApkJb+MO6l0BysC17Gx5BtKz 7dAigZZMEDqCs7G+HX7GoZPNK/xYD9tGrInx9APyS/kB+1IMDj9ezg9AG4b+3CIejp XbZcX6blvYXXw== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4WknBP4Swvz4wp0; Thu, 15 Aug 2024 11:11:08 +1000 (AEST) Date: Thu, 15 Aug 2024 11:11:07 +1000 From: Stephen Rothwell To: Matthieu Baerts Cc: Frank Li , "David S. Miller" , Jakub Kicinski , Krzysztof Kozlowski , imx@lists.linux.dev, Eric Dumazet , Rob Herring , Conor Dooley , "open list:NETWORKING DRIVERS" , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , open list , Ioana Ciornei , Paolo Abeni Subject: Re: [PATCH v3 1/1] dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties: manual merge Message-ID: <20240815111107.15bfbf93@canb.auug.org.au> In-Reply-To: <6b5897e7-1bed-4eb3-8574-093db5dea159@kernel.org> References: <20240811184049.3759195-1-Frank.Li@nxp.com> <6b5897e7-1bed-4eb3-8574-093db5dea159@kernel.org> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/aPD.HFt93=D=+W9o/EKyCJQ"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/aPD.HFt93=D=+W9o/EKyCJQ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Matthieu, On Wed, 14 Aug 2024 11:06:10 +0200 Matthieu Baerts wro= te: > > FYI, we got a small conflict when merging 'net' in 'net-next' in the > MPTCP tree due to this patch applied in 'net': >=20 > c25504a0ba36 ("dt-bindings: net: fsl,qoriq-mc-dpmac: add missed > property phys") >=20 > and this one from 'net-next': >=20 > be034ee6c33d ("dt-bindings: net: fsl,qoriq-mc-dpmac: using > unevaluatedProperties") > > Regarding this conflict, a merge of the two modifications has been > taken: adding 'phys', and removing 'managed' Thanks for the heads up. --=20 Cheers, Stephen Rothwell --Sig_/aPD.HFt93=D=+W9o/EKyCJQ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAma9VasACgkQAVBC80lX 0Gwvkgf9HtOzYV8LuzEXP88ithcFW7/+sTYyD80bPKv6k5CXgAjVPTV2N+/SZSwr ABrsyj6W0YBb8EAZm3C3NxBJbPNkxQ6o/d6DfK0Y3WeEd9dGaJNU3NrQ5o92vhCp Jx819A0fCBeIwi6SmI8hbSIXZ0aHuN+2QzjqIZtlKVdWl/87osqwHVuPlVkRTy79 CIlfrpYQ7Ecpwt1fUUJTjqqOdTzXPRG2OuZzHU+pZoVxI3M1SjdfSXn/BUjL+wJ6 OGI+lML6E+0T3q/R4QT+VDxyTw+CkYShLSTQ2jfPsjBLFOAcH5RyHnDYlOs7pfGe y/4R8xUKD/S6ZeNNP7Ttb6Y7zNM25Q== =zKyj -----END PGP SIGNATURE----- --Sig_/aPD.HFt93=D=+W9o/EKyCJQ--