From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
John Ogness <john.ogness@linutronix•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Lukas Wunner <lukas@wunner•de>,
Thomas Gleixner <tglx@linutronix•de>
Subject: Re: linux-next: manual merge of the tty tree with the tty.current tree
Date: Wed, 4 Oct 2023 13:14:32 +1100 [thread overview]
Message-ID: <20231004131432.40b7b946@canb.auug.org.au> (raw)
In-Reply-To: <20231004125531.0c61a99d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2632 bytes --]
Hi all,
On Wed, 4 Oct 2023 12:55:31 +1100 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:
>
> 8679328eb859 ("serial: Reduce spinlocked portion of uart_rs485_config()")
>
> from the tty.current tree and commit:
>
> 559c7ff4e324 ("serial: core: Use port lock wrappers")
>
> 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.
Not quite right :-( This is what I used:
diff --cc drivers/tty/serial/serial_core.c
index ca26a8aef2cb,b32bbd7aa3d3..ae1d6782ea0e
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@@ -1413,9 -1409,7 +1413,9 @@@ static int uart_rs485_config(struct uar
uart_sanitize_serial_rs485(port, rs485);
uart_set_rs485_termination(port, rs485);
- spin_lock_irqsave(&port->lock, flags);
++ uart_port_lock_irqsave(port, &flags);
ret = port->rs485_config(port, NULL, rs485);
- spin_unlock_irqrestore(&port->lock, flags);
++ uart_port_unlock_irqrestore(port, flags);
if (ret)
memset(rs485, 0, sizeof(*rs485));
@@@ -2480,12 -2474,13 +2480,12 @@@ int uart_resume_port(struct uart_drive
if (ret == 0) {
if (tty)
uart_change_line_settings(tty, state, NULL);
+ uart_rs485_config(uport);
- spin_lock_irq(&uport->lock);
+ uart_port_lock_irq(uport);
if (!(uport->rs485.flags & SER_RS485_ENABLED))
ops->set_mctrl(uport, uport->mctrl);
- else
- uart_rs485_config(uport);
ops->start_tx(uport);
- spin_unlock_irq(&uport->lock);
+ uart_port_unlock_irq(uport);
tty_port_set_initialized(port, true);
} else {
/*
@@@ -2592,10 -2587,10 +2592,10 @@@ uart_configure_port(struct uart_driver
port->mctrl &= TIOCM_DTR;
if (!(port->rs485.flags & SER_RS485_ENABLED))
port->ops->set_mctrl(port, port->mctrl);
- spin_unlock_irqrestore(&port->lock, flags);
- else
- uart_rs485_config(port);
+ uart_port_unlock_irqrestore(port, flags);
+ uart_rs485_config(port);
+
/*
* If this driver supports console, and it hasn't been
* successfully registered yet, try to re-register it.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-10-04 2:14 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-04 1:55 linux-next: manual merge of the tty tree with the tty.current tree Stephen Rothwell
2023-10-04 2:14 ` Stephen Rothwell [this message]
2023-10-04 6:38 ` Greg KH
2023-10-16 8:20 ` Greg KH
-- 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
2024-04-11 3:57 Stephen Rothwell
2024-04-11 4:17 ` Stephen Rothwell
2024-04-11 4:38 ` Greg KH
2024-04-11 10:40 ` Andy Shevchenko
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=20231004131432.40b7b946@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=john.ogness@linutronix$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lukas@wunner$(echo .)de \
--cc=tglx@linutronix$(echo .)de \
/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