From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
linux-serial <linux-serial@vger.kernel.org>,
kernel@pengutronix.de
Subject: Re: [PATCH] serial: 8250: Fix mismerge regarding serial_lsr_in()
Date: Thu, 2 Feb 2023 14:59:03 +0100 [thread overview]
Message-ID: <Y9vBp5FDi5leXQyA@kroah.com> (raw)
In-Reply-To: <20230202134057.v6mjwvbrxdvfackb@pengutronix.de>
On Thu, Feb 02, 2023 at 02:40:57PM +0100, Uwe Kleine-König wrote:
> Hello Ilpo,
>
> On Thu, Feb 02, 2023 at 02:09:38PM +0200, Ilpo Järvinen wrote:
> > On Thu, 2 Feb 2023, Uwe Kleine-König wrote:
> > > On Thu, Feb 02, 2023 at 01:26:08PM +0200, Ilpo Järvinen wrote:
> > > > I don't know if Fixes tag is appropriate here. This fixes the mismerge
> > > > yes, however, the removed line itself seems harmless so there's no real
> > > > problem to fix.
> > >
> > > It might make a difference if LSR_SAVE_FLAGS != p->lsr_save_mask.
> >
> > But currently lsr_save_mask always has at least LSR_SAVE_FLAGS bits so
> > that OR is no-op.
>
> Oh indeed. So it's even more harmless than I thought. Thanks.
>
> @gregkh: I don't feel strong about the Fixes line, drop it if you prefer
> to not have it.
I'll drop it, thanks!
greg k-h
prev parent reply other threads:[~2023-02-02 13:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-02 10:45 [PATCH] serial: 8250: Fix mismerge regarding serial_lsr_in() Uwe Kleine-König
2023-02-02 11:26 ` Ilpo Järvinen
2023-02-02 12:04 ` Uwe Kleine-König
2023-02-02 12:09 ` Ilpo Järvinen
2023-02-02 13:40 ` Uwe Kleine-König
2023-02-02 13:59 ` Greg Kroah-Hartman [this message]
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=Y9vBp5FDi5leXQyA@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=kernel@pengutronix.de \
--cc=linux-serial@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.