From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lakostis@altlinux.org>
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on
 sa.local.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham
 autolearn_force=no version=3.4.1
Date: Fri, 9 Jun 2023 16:54:40 +0200
From: Konstantin Lepikhov <lakostis@altlinux.org>
To: devel-kernel@lists.altlinux.org
Message-ID: <ZIM9MEvDDikk5O0d@lks.home>
Mail-Followup-To: devel-kernel@lists.altlinux.org
References: <20230609142609.t2qq4i5e2cfew4q4@altlinux.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20230609142609.t2qq4i5e2cfew4q4@altlinux.org>
X-Operation-System: ALT Sisyphus Sisyphus (unstable) (sisyphus)
 6.1.0-lks-wks-alt6.32
User-Agent: Mutt/2.1.1.0.3.g6c0f75cca (2021-07-12)
Subject: Re: [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:54:45 -0000
Archived-At: <http://lore.altlinux.org/devel-kernel/ZIM9MEvDDikk5O0d@lks.home/>
List-Archive: <http://lore.altlinux.org/devel-kernel/>
List-Post: <mailto:devel-kernel@altlinux.org>

Hi Vitaly!

On 06/09/2023, at 05:26:09 PM you wrote:

> 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
> 
> Как лучше это решить?
> 
Если это действительно overrun messages то лучше делать ratelimit (не
заглядывая в логику драйвера байкала).

-- 
WBR et al.