From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vt@altlinux.org>
Date: Fri, 9 Jun 2023 17:26:09 +0300
From: Vitaly Chikunov <vt@altlinux.org>
To: ALT Linux kernel development <devel-kernel@lists.altlinux.org>
Message-ID: <20230609142609.t2qq4i5e2cfew4q4@altlinux.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Subject: [d-kernel] CONFLICT: sound/soc/dwc/dwc-i2s.c: dwc-i2s: support
	Baikal-M SoC
X-BeenThere: devel-kernel@lists.altlinux.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: ALT Linux kernel packages development
 <devel-kernel@lists.altlinux.org>
List-Id: ALT Linux kernel packages development
 <devel-kernel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/devel-kernel>,
 <mailto:devel-kernel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel-kernel>
List-Post: <mailto:devel-kernel@lists.altlinux.org>
List-Help: <mailto:devel-kernel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel-kernel>,
 <mailto:devel-kernel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jun 2023 14:26:10 -0000
Archived-At: <http://lore.altlinux.org/devel-kernel/20230609142609.t2qq4i5e2cfew4q4@altlinux.org/>
List-Archive: <http://lore.altlinux.org/devel-kernel/>
List-Post: <mailto:devel-kernel@altlinux.org>

Alexey,

Случился merge conflict апстримного кода (stable/linux-5.15.y):

  e9d167c 2023-05-05 09:28 Maxim Kochetkov   ∙ ASoC: dwc: limit the number of overrun messages

с нашим (std-def/sisyphus):

  843884b 2022-05-23 19:35 Alexey Sheplyakov ∙ (BROKEN) dwc-i2s: support Baikal-M SoC

Как лучше это решить?

> + git merge --no-edit v6.1.33
> Auto-merging sound/soc/dwc/dwc-i2s.c
> CONFLICT (content): Merge conflict in sound/soc/dwc/dwc-i2s.c
> Auto-merging drivers/firmware/efi/libstub/arm64-stub.c
> Recorded preimage for 'sound/soc/dwc/dwc-i2s.c'
> Automatic merge failed; fix conflicts and then commit the result.
> diff --cc sound/soc/dwc/dwc-i2s.c
> index 1568d82166f3,3496301582b2..000000000000
> --- a/sound/soc/dwc/dwc-i2s.c
> +++ b/sound/soc/dwc/dwc-i2s.c
> @@@ -137,13 -136,9 +137,19 @@@ static irqreturn_t i2s_irq_handler(int 
>   			irq_valid = true;
>   		}
>   
>  -		/* Error Handling: TX */
>  +		/* Error Handling: RX */
>   		if (isr[i] & ISR_RXFO) {
> ++<<<<<<< HEAD
>  +			rxor_count = READ_ONCE(dev->rx_overrun_count);
>  +			if (!(rxor_count & 0x3ff))
>  +				dev_dbg(dev->dev, "RX overrun (ch_id=%d)\n", i);

Замена dev_dbg на dev_dbg_ratelimited или отказываемся от апстримных
изменений?

>  +			rxor_count++;
>  +			WRITE_ONCE(dev->rx_overrun_count, rxor_count);
> ++||||||| 76ba310227d2
> ++			dev_err(dev->dev, "RX overrun (ch_id=%d)\n", i);
> ++=======
> + 			dev_err_ratelimited(dev->dev, "RX overrun (ch_id=%d)\n", i);
> ++>>>>>>> v6.1.33
>   			irq_valid = true;
>   		}
>   	}