From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: Andy Shevchenko <andriy.shevchenko@linux•intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
"Jiri Slaby (SUSE)" <jirislaby@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the tty tree with the tty.current tree
Date: Thu, 11 Apr 2024 14:17:11 +1000 [thread overview]
Message-ID: <20240411141711.63dbd8e9@canb.auug.org.au> (raw)
In-Reply-To: <20240411135735.58de7090@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2203 bytes --]
Hi all,
On Thu, 11 Apr 2024 13:57:35 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> drivers/tty/serial/serial_core.c
>
> between commit:
>
> 9cf7ea2eeb74 ("serial: core: Clearing the circular buffer before NULLifying it")
>
> from the tty.current tree and commit:
>
> 1788cf6a91d9 ("tty: serial: switch from circ_buf to kfifo")
>
> from the tty 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/tty/serial/serial_core.c
> index 2247efe97250,a78ded8c60b5..000000000000
> --- a/drivers/tty/serial/serial_core.c
> +++ b/drivers/tty/serial/serial_core.c
> @@@ -1788,9 -1773,9 +1773,10 @@@ static void uart_tty_port_shutdown(stru
> * Free the transmit buffer.
> */
> uart_port_lock_irq(uport);
> + uart_circ_clear(&state->xmit);
> - buf = state->xmit.buf;
> - state->xmit.buf = NULL;
> + buf = port->xmit_buf;
> + port->xmit_buf = NULL;
> + INIT_KFIFO(port->xmit_fifo);
> uart_port_unlock_irq(uport);
>
> free_page((unsigned long)buf);
That didn't work :-(
So I have used the below resolution instead.
--
Cheers,
Stephen Rothwell
diff --cc drivers/tty/serial/serial_core.c
index 2247efe97250,a78ded8c60b5..000000000000
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@@ -1788,9 -1773,9 +1773,10 @@@ static void uart_tty_port_shutdown(stru
* Free the transmit buffer.
*/
uart_port_lock_irq(uport);
- uart_circ_clear(&state->xmit);
- buf = state->xmit.buf;
- state->xmit.buf = NULL;
++ kfifo_reset(&state->port.xmit_fifo);
+ buf = port->xmit_buf;
+ port->xmit_buf = NULL;
+ INIT_KFIFO(port->xmit_fifo);
uart_port_unlock_irq(uport);
free_page((unsigned long)buf);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-04-11 4:17 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-11 3:57 linux-next: manual merge of the tty tree with the tty.current tree Stephen Rothwell
2024-04-11 4:17 ` Stephen Rothwell [this message]
2024-04-11 4:38 ` Greg KH
2024-04-11 10:40 ` Andy Shevchenko
-- strict thread matches above, loose matches on Subject: below --
2025-11-27 1:09 Stephen Rothwell
2025-11-27 6:52 ` Greg KH
2024-07-09 5:37 Stephen Rothwell
2024-07-09 11:04 ` Greg KH
2024-04-19 4:19 Stephen Rothwell
2024-04-19 6:09 ` Greg KH
2024-04-23 11:24 ` Greg KH
2023-10-04 1:55 Stephen Rothwell
2023-10-04 2:14 ` Stephen Rothwell
2023-10-04 6:38 ` Greg KH
2023-10-16 8:20 ` Greg KH
2020-09-17 6:09 Stephen Rothwell
2020-09-17 6:34 ` Greg KH
2019-12-18 0:49 Stephen Rothwell
2019-12-18 7:05 ` Greg KH
2017-08-02 4:26 Stephen Rothwell
2017-08-04 1:02 ` Greg KH
2017-08-14 22:17 ` Greg KH
2017-03-20 2:28 Stephen Rothwell
2017-03-20 9:21 ` Dmitry Vyukov
2017-03-20 9:26 ` Dmitry Vyukov
2017-03-29 5:51 ` Greg KH
2017-03-30 3:46 ` Michael Neuling
2017-03-30 12:17 ` Dmitry Vyukov
2016-02-08 2:16 Stephen Rothwell
2016-02-08 2:21 ` Greg KH
2016-02-08 2:53 ` Peter Hurley
2016-04-01 0:23 ` Peter Hurley
2016-04-01 3:49 ` Greg KH
2015-05-25 8:19 Stephen Rothwell
2015-05-25 16:28 ` Greg KH
2015-05-26 11:08 ` Dave Martin
2014-11-26 7:12 Stephen Rothwell
2014-11-26 19:51 ` Greg KH
2014-11-10 4:49 Stephen Rothwell
2014-11-10 5:08 ` Greg KH
2013-01-17 2:07 Stephen Rothwell
2013-01-18 1:27 ` Greg KH
2012-04-19 4:59 Stephen Rothwell
2012-04-19 20:07 ` Greg KH
2012-04-23 16:40 ` Greg KH
2011-11-18 3:30 Stephen Rothwell
2011-11-18 8:41 ` Jiri Slaby
2011-11-18 16:18 ` Greg KH
2011-11-27 4:08 ` Greg KH
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=20240411141711.63dbd8e9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andriy.shevchenko@linux$(echo .)intel.com \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=jirislaby@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox