From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 ED71C2D6614; Thu, 24 Jul 2025 13:49:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753364965; cv=none; b=sNZo4dyfZ85OtYdRo7TP2d27/Nkh6Hv/pcwkSGENruN7howaQbi4IhGf0IqSvVGPwZcq7CdwNGSgsMyFXbdNrwJOALGn1FJBm1MwxMnox7XgSHv+oxAIplDi284evUh2jdn+0PMBvqLbEVq3j+jr5WBkoEyR03xrXabZZ9wPfs0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753364965; c=relaxed/simple; bh=C+VK9E45zhavmmZ7zZic1kk5tDmpgiK9enCL/Nt6HJs=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HPB66f+9jGPIJbztIDv/6sxpuWkTthwyqOuIa1FPR4gPirUQkzW8eOJUpp1oL1sHBsa6yi3bFZznfJ2SIhkEc3OJyhJ9k+wXeNlsZCKDGno/j2lup+WtgB9/7MoswUR1JPUpr4hdBHYLLPMrffpHIOHG+qWCj7kwi/+jHQAjZSM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rrRHwbsv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rrRHwbsv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85087C4CEED; Thu, 24 Jul 2025 13:49:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753364964; bh=C+VK9E45zhavmmZ7zZic1kk5tDmpgiK9enCL/Nt6HJs=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=rrRHwbsvmewjuO2ODNtc+AEDzbQmkZsspvR0lgt22HLbV72077LKMYJGX6N9SYQzv tEoOom6onnC92EgJrJsjklwRNA/6swPlLgGR+YD6ElI1ggekTURly1ra10+fPAagIG c3WZftDOL/IfhCaqUdlvL1jVs2vD2xd6ZCkYcZI1aHqvaji7sFsB7CwsTW2w1FOB5r Px+MvvORNXGm08eSC+VF+F0L/ehJaP7OSBRRSUZOdZkpZMZkwmPCxrYv+NI4hcIdy7 /lE4WqXD39vBvdp6NoO9zSmi+87F9d2XW1O6+9haPIlDEWzmzUbHOemlP5uIVZLkpa KwV1Y2wxeDVag== Date: Thu, 24 Jul 2025 14:49:16 +0100 From: Jonathan Cameron To: Stephen Rothwell Cc: Mark Brown , Greg KH , Arnd Bergmann , David Lechner , Jonathan Cameron , Jonathan Santos , Linux Kernel Mailing List , Linux Next Mailing List , linux-iio@vger.kernel.org Subject: Re: linux-next: manual merge of the iio tree with the spi tree Message-ID: <20250724144916.436a29b3@jic23-huawei> In-Reply-To: <20250721125545.6db07df5@canb.auug.org.au> References: <20250703163824.2f08d866@canb.auug.org.au> <20250703093122.00000684@huawei.com> <20250706115053.368ce9e9@jic23-huawei> <20250721125545.6db07df5@canb.auug.org.au> X-Mailer: Claws Mail 4.3.1 (GTK 3.24.49; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Mon, 21 Jul 2025 12:55:45 +1000 Stephen Rothwell wrote: > Hi all, > > On Sun, 6 Jul 2025 11:15:14 -0500 David Lechner wrote: > > > > On 7/6/25 5:50 AM, Jonathan Cameron wrote: > > > On Thu, 3 Jul 2025 07:28:07 -0500 > > > David Lechner wrote: > > > > > >> On 7/3/25 3:31 AM, Jonathan Cameron wrote: > > >>> On Thu, 3 Jul 2025 16:38:24 +1000 > > >>> Stephen Rothwell wrote: > > >>> > > >>>> Today's linux-next merge of the iio tree got a conflict in: > > >>>> > > >>>> MAINTAINERS > > >>>> > > >>>> between commit: > > >>>> > > >>>> e47a324d6f07 ("dt-bindings: trigger-source: add ADI Util Sigma-Delta SPI") > > >>>> > > >>>> from the spi tree and commit: > > >>>> > > >>>> 0dd88eaa7126 ("dt-bindings: trigger-source: add generic GPIO trigger source") > > >>>> > > >>>> from the iio 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. > > >>>> > > >>> Thanks Stephen, > > >>> > > >>> David, do you prefer these merged or kept as separate entries? > > >> > > >> Ah, shoot, I forgot that we had added the gpio one and just made > > >> one section like this. > > >> > > >> I think it would make sense to also merge the new adi one with > > >> the reset to keep things compact. > > >> > > > Is there a path to do that cleanly given the multiple trees things are > > > coming from? Maybe this is a let things resolve whatever way this cycle > > > and tidy up next? > > > > Agree, waiting seems the simplest option. > > > > > > > >>> > > >>> I don't think it matters either way in practice though this is the > > >>> more complex merge (the other being just putting the blocks in order. > > >>> > > >>> We can put a note in the pull request on preference but ultimately Linus > > >>> will resolve this however he prefers! > > >>> > > >>> Jonathan > > >>> > > >>> > > >>>> -- > > >>>> Cheers, > > >>>> Stephen Rothwell > > >>>> > > >>>> diff --cc MAINTAINERS > > >>>> index dd764b947dab,d0809d62ff48..000000000000 > > >>>> --- a/MAINTAINERS > > >>>> +++ b/MAINTAINERS > > >>>> @@@ -25333,19 -25201,15 +25341,20 @@@ TRADITIONAL CHINESE DOCUMENTATIO > > >>>> M: Hu Haowen <2023002089@link.tyut.edu.cn> > > >>>> S: Maintained > > >>>> W: https://github.com/srcres258/linux-doc > > >>>> -T: git git://github.com/srcres258/linux-doc.git doc-zh-tw > > >>>> +T: git https://github.com/srcres258/linux-doc.git doc-zh-tw > > >>>> F: Documentation/translations/zh_TW/ > > >>>> > > >>>> + TRIGGER SOURCE > > >>>> + M: David Lechner > > >>>> + S: Maintained > > >>>> + F: Documentation/devicetree/bindings/trigger-source/gpio-trigger.yaml > > >>>> + F: Documentation/devicetree/bindings/trigger-source/pwm-trigger.yaml > > >>>> + > > >>>> +TRIGGER SOURCE - ADI UTIL SIGMA DELTA SPI > > >>>> +M: David Lechner > > >>>> +S: Maintained > > >>>> +F: Documentation/devicetree/bindings/trigger-source/adi,util-sigma-delta-spi.yaml > > >>>> + > > >>>> - TRIGGER SOURCE - PWM > > >>>> - M: David Lechner > > >>>> - S: Maintained > > >>>> - F: Documentation/devicetree/bindings/trigger-source/pwm-trigger.yaml > > >>>> - > > >>>> TRUSTED SECURITY MODULE (TSM) INFRASTRUCTURE > > >>>> M: Dan Williams > > >>>> L: linux-coco@lists.linux.dev > > This is now a conflict between the char-misc tree and the spi tree. Ah. Sorry Greg, I meant to mention this in the pull request. In earlier discussion we concluded that best bet was to let it resolve as separate entries (as Stephen has) and then we'll clean it up next cycle if it makes sense to unify more of them. Thanks Stephen for dealing with our mess! Jonathan >