From patchwork Thu Aug 15 01:09:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13764349 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 AAD0BA35; Thu, 15 Aug 2024 01:09:37 +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=1723684183; cv=none; b=aZ7HyGRErGMCQekBDdpdvRP+OLbx8/60dlXjZNsfKZbZ0LLvzeglylMO10y6v0wyPbjgZguQPWBETI4AmpR4QOtp7/xWtTJ7SKex/2kanZ2W576rP/0BgDkABpQo+XoV1+waR3WhHumtJYO4R2s5h2ZhA34tBkRPXCFLWCkPqlU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723684183; c=relaxed/simple; bh=vg2Wjc5euDomGCMAqhjZEOHP9uOGK6l6Wt4V4e/gn5g=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=sc2auVL/B2A/5SMyyKL+UDWYKGLqcoFlR5ZTvcxK7+SxAN3QbGMtpVB6D+RRS9+yaq2tN9uU+ovlc7CqqiYaTr4NeRqqw00xeudmmgyw+7i7xTyalPHqVkrHKDoop+duqfJtB6ggOJOPSeJ9HGfmz1/aO7SjCwqsAxbTjWn5PBg= 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=oO4tOq2p; 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="oO4tOq2p" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1723684175; bh=DTv7Q17SAzkWVrxCxVb76izIXRqxVHyiQ48h97d/Z1Q=; h=Date:From:To:Cc:Subject:From; b=oO4tOq2pl729y4kfvmycq6SgDU+EXhg109kKYU/bmc2MJdAf6zwOM8yyMHViIQqRm Wwe1H05WkDzG5avyCnagLOqmkt8TZ6FctmHdqZ9OQAuGoHhg22vBBWoGHpIIJdgNRz 2ZQyDVNYyVYqm4XEQ6x3T0LgAvzJpYNCyeTvxA0Q/E+yQrvQGTCPi6bmtIgkzIhU7r 4P/HdQDfRHE6JLpHln1Csy92BfPJdNuePyD6PmwYX9Dc7v4XVE9g4+DY2jtLS1xxNX D4IXxH5aSYphiICGQxRxejKQoXgxdNItXieWgReclXCgHYjNvSj0tPskjAD2jE0JGX RqW43/897elZQ== 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 4Wkn8b2Zgjz4wnx; Thu, 15 Aug 2024 11:09:34 +1000 (AEST) Date: Thu, 15 Aug 2024 11:09:34 +1000 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Frank Li , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20240815110934.56ae623a@canb.auug.org.au> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, Today's linux-next merge of the net-next tree got a conflict in: Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml between commit: c25504a0ba36 ("dt-bindings: net: fsl,qoriq-mc-dpmac: add missed property phys") from the net tree and commit: be034ee6c33d ("dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties") from the net-next 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 Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml index 42f9843d1868,f19c4fa66f18..000000000000 --- a/Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml