From patchwork Thu Nov 7 10:43:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13866150 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 DD49A1F4FA7; Thu, 7 Nov 2024 10:43:54 +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=1730976238; cv=none; b=AWqvHt4rFBxfEixGP8s29AuvKLdEXA7vxD+1WKTdkgbkFU2pfLHHK73KzoFfLmqz/rjNVUlaieK0iEhnh/0ggJK3reo1NH1WqsHwP+jBfTxiMs/8eOWW62F/NdpIeFFY+WVMlvBnRSqQUvdGfCfqg09Y+j6GQmC7lfurj/q5+ug= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730976238; c=relaxed/simple; bh=X3ED5tXhkHujGgzUR1+C91PbNKBMFbhQSO35RVYbhm4=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=e8BOYlWenQi/c4pnnvRXbSooQYiJmSJk5YxcnjcTXxGw7H89zRe/O9TLaTuRDAW2UXdhQYE6L1cNOofN7V3ShQdSGVnklOHAH0yf9Adqw2cwO6HOiTv0dzxDZaQGutTMSFIohbxQ09J7hBsMpNzuEpYkrwhhte2jPOHaU/Na3Tc= 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=DdNPkhkr; 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="DdNPkhkr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1730976230; bh=NNGiz6SGhA/04CL4AMK1MojVzOnINp1eU/OCPu9ZPFE=; h=Date:From:To:Cc:Subject:From; b=DdNPkhkrKpWAmoXjy1YcWVDURMC/0xkF+dBD4n5w4mByHooK6+ARkJHXKFGShmrQr PikEqC3J1qzQYzNC5hDPq2s/BMlvoynWkuz0DI63ZIW0Nh6t4nb6oGF7xg+HHMaQ+9 /sHsOcFi0g0pDnsZ1BfeFCwHf+FDNWY0RA2fNFG/r84SWt1vBRWzaT2NSjo1Izmftt 9asBTW9E/r/J0G/xkXmB2kQHZkeLJzY5ad2Umoi1HYchS30DmUiKEswcQPaIrK0iOV s33Y2Wzh5f5ZtEMOlKayAtYkQn4NMWQnX6HnqxQSpwjjxL18f4yPDMQN0QvQpPjZXR //Yl3VnkqVB3Q== 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 4XkdwP2Flqz4x8f; Thu, 7 Nov 2024 21:43:49 +1100 (AEDT) Date: Thu, 7 Nov 2024 21:43:51 +1100 From: Stephen Rothwell To: Linus Walleij , David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Drew Fustini , Emil Renner Berthing , Jisheng Zhang , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the pinctrl tree with the net-next tree Message-ID: <20241107214351.59b251f1@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 pinctrl tree got a conflict in: MAINTAINERS between commits: f920ce04c399 ("dt-bindings: net: Add T-HEAD dwmac support") 33a1a01e3afa ("net: stmmac: Add glue layer for T-HEAD TH1520 SoC") from the net-next tree and commits: 137ca342ae2d ("dt-bindings: pinctrl: Add thead,th1520-pinctrl bindings") bed5cd6f8a98 ("pinctrl: Add driver for the T-Head TH1520 SoC") from the pinctrl 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 MAINTAINERS index 730c67f26c96,ff99fb6ad20c..000000000000 --- a/MAINTAINERS