From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f43.google.com (mail-oa1-f43.google.com [209.85.160.43]) (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 9447A199FD0 for ; Sun, 6 Jul 2025 16:15:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751818519; cv=none; b=J3CQiF4y5e6VEy+V25911fsANqzFWiJz+W4hmgiNtvqgLSWVFiDsr9Ln8lUihQvvWovHGrIlr0lseEaov1wXXgbSHIR8D8nGYX8wJQy/y/6R4eVgHQTlnns5qqtaLLp4Z/0zH4Rf3CAdqVK1ix5L3uNnnfBmHoa1WenDg+aeYYg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751818519; c=relaxed/simple; bh=gAl855rLWquCepFOF4TJTi7lIXQsNdl/NaKUIwd2ESw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Dv0A6iTJUxKD62M4KZxvr/jkPF5Z6JuCFMJ0P36RF8PgGBLiKiDeYGRJ5H0/cIEeyZgJQj81UAjxiMJFr7LLm0vK0xrCKHbyDRCm6dRWmnVoyEVEunScjKR6BJtgiC/a7eXXCe5QFyZdVHOZerPLmi0xhyQ6Xg7fdHLTtMubAH0= 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.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=JBAp93tD; arc=none smtp.client-ip=209.85.160.43 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.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="JBAp93tD" Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-2ef60dbaefbso1938195fac.1 for ; Sun, 06 Jul 2025 09:15:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1751818516; x=1752423316; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=7CCuIhaGw2JUP5L8X9VuvKKmy1/AXHlJm0W9YGonXO4=; b=JBAp93tDdjtqW7hELY1jleZr4J4UJBOt4lAE7Z40k5qRtW7t4IKWIohbJTZwNMxT0D Zn0AAGPk4CE5GK4NIJoUBdKe1QNGo14De++yr5QJ0e6/M0O1+8A92MLVn3h447VWlDLm 8vkaBJZmtP/PFhdiFh037KlZHS9hExzNDQkx25a8nXbisqg23XMGW+I+xCcA+rXXd/Zv 7msUTIePkrQhLgQ7zkBfl9JIcssYhHXtF9MWPO5yHuuT1hL9neJ98Eun5ZVusutC4E8i 26dGvrEWXCcs8ykfxd6SIIoCHlbXtCHejQhrjxy+f3WTQetvd5SHszp2myFDSBWne2FL ac7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751818516; x=1752423316; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7CCuIhaGw2JUP5L8X9VuvKKmy1/AXHlJm0W9YGonXO4=; b=dvB16LqBBLxSeHaF/H6cYz1zR+Q1rCBu2oqbWTGvEO+/9aSdDJcHRYsvRD0N51yIGB ZXvEmypmuw2R9J/ovIRtTET0xiysx6QCXChnqta/ZIFzAOkoBx44/apBZad7jjI34CDD 1NYA6JHZCFlMsj+FRM03pI32d9S6by9IkS7GejZ/ZdkblWtWX/G5yR0pVvDYJOWcuoxH sYSwcUpXXcZVFFRt4t53bWLfxYbz0Z3eGrsjwlTRWpVsf/SzYFi2UBqA/jlTjMOYYhoH ChvCWBi+Ne1NlHaJLJw3QU9sh1ClSAn3pMPp2O4xzCQCqyV588hAq+EVAoFTaPxwqdic MFqg== X-Forwarded-Encrypted: i=1; AJvYcCWNKN2JBjdigZnhK7qZsu6WkPl9anpIPPKV0+gq2R8/IdTBSE/0nLt2zB3vAf94poQRYFNnS/7AkzgV@vger.kernel.org X-Gm-Message-State: AOJu0YzN5QNrQOw2mukT//TvE+Ive6jzrehqqbuxUOPyaQum/mUBry2x IOinX4bLHVBO2ZLFdUnIDz3+sLtB8WtPkfX9KXb+acdaI3MPhWrTXbAf9G9HQk4VWVs= X-Gm-Gg: ASbGncv3PAAzen8MG2bnuRqORghSDipbzB0zieKf8fBsddLvyAbkSDARV+oP1qtf6JZ /nDnkvuGMtbTviDW7YGnqNICIYi0No0UT3jw3rH34lE2QQUWA4+yHYWVAfLGWyy4mr0WU/PwLJP M5lOjEuCXW2A/n82xQEdztX7H9IqGAXGIyMdqaKxdXRajsuQbBM1cmTdsycBCj6z2pn36aUWLyr jGf7VEp4tofpwJAWVdQWFbHiRKFOsgIYc8Cca1wW6BOCQYydpeahE76qGB2iJyP70sYFwOVoGfm KTNtxDmCOxOhGkfGgkXdUpexT7dNmarhi6LNzTTpkCvLtQTXi7xfCkIrQN2kxjQQ8sGuiO7lrVH lu63vAGN2vLUggSA/gOEXYb5qE9mLYEV7CKmTnSsQYRjMKfY= X-Google-Smtp-Source: AGHT+IFCTPIZ0WXVRAmR7v768qE2jySN2EB/oekDv6XWLXwEPF+k2fWpAsncS+4yrAvfVEulhT/Vvw== X-Received: by 2002:a05:6871:79a5:b0:2d4:e101:13dd with SMTP id 586e51a60fabf-2f791cebf01mr7263590fac.1.1751818516500; Sun, 06 Jul 2025 09:15:16 -0700 (PDT) Received: from ?IPV6:2600:8803:e7e4:1d00:29a:290f:4321:4624? ([2600:8803:e7e4:1d00:29a:290f:4321:4624]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-2f79020d17csm1749699fac.34.2025.07.06.09.15.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 06 Jul 2025 09:15:15 -0700 (PDT) Message-ID: Date: Sun, 6 Jul 2025 11:15:14 -0500 Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: manual merge of the iio tree with the spi tree To: Jonathan Cameron Cc: Jonathan Cameron , Stephen Rothwell , Mark Brown , Jonathan Santos , Linux Kernel Mailing List , Linux Next Mailing List , linux-iio@vger.kernel.org References: <20250703163824.2f08d866@canb.auug.org.au> <20250703093122.00000684@huawei.com> <20250706115053.368ce9e9@jic23-huawei> Content-Language: en-US From: David Lechner In-Reply-To: <20250706115053.368ce9e9@jic23-huawei> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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: >>> >>>> Hi all, >>>> >>>> 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 >> >> >