From: Vitaly Chikunov <vt@altlinux.org> To: ALT Linux kernel development <devel-kernel@lists.altlinux.org> Subject: [d-kernel] CONFLICT: sound/soc/dwc/dwc-i2s.c: dwc-i2s: support Baikal-M SoC Date: Fri, 9 Jun 2023 17:26:09 +0300 Message-ID: <20230609142609.t2qq4i5e2cfew4q4@altlinux.org> (raw) 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; > } > }
next reply other threads:[~2023-06-09 14:26 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-06-09 14:26 Vitaly Chikunov [this message] 2023-06-09 14:54 ` Konstantin Lepikhov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230609142609.t2qq4i5e2cfew4q4@altlinux.org \ --to=vt@altlinux.org \ --cc=devel-kernel@lists.altlinux.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
ALT Linux kernel packages development This inbox may be cloned and mirrored by anyone: git clone --mirror http://lore.altlinux.org/devel-kernel/0 devel-kernel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 devel-kernel devel-kernel/ http://lore.altlinux.org/devel-kernel \ devel-kernel@altlinux.org devel-kernel@altlinux.ru devel-kernel@altlinux.com public-inbox-index devel-kernel Example config snippet for mirrors. Newsgroup available over NNTP: nntp://lore.altlinux.org/org.altlinux.lists.devel-kernel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git