From: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
To: Vladimir Oltean <vladimir.oltean@nxp.com>
Cc: Andy Duan <fugang.duan@nxp.com>,
"michael@walle.cc" <michael@walle.cc>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: Re: FAILED: patch "[PATCH] tty: serial: fsl_lpuart: LS1021A has a FIFO size of 16 words," failed to apply to 5.4-stable tree
Date: Mon, 9 Nov 2020 11:18:04 +0100 [thread overview]
Message-ID: <20201109101804.GA1065310@kroah.com> (raw)
In-Reply-To: <20201103224825.gxvly2qijdr2hmsk@skbuf>
On Tue, Nov 03, 2020 at 10:48:26PM +0000, Vladimir Oltean wrote:
> On Tue, Nov 03, 2020 at 03:23:20PM +0100, gregkh@linuxfoundation.org wrote:
> > The patch below does not apply to the 5.4-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
>
> Greg,
>
> For linux-5.4.y, could you please do the following so that I don't need
> to explicitly resend these to linux-stable?
>
> # tty: serial: fsl_lpuart: add LS1028A support
> git cherry-pick -xs c2f448cff22a7ed09281f02bde084b0ce3bc61ed # this is dependency
> # tty: serial: fsl_lpuart: LS1021A has a FIFO size of 16 words, like LS1028A
> git cherry-pick -xs c97f2a6fb3dfbfbbc88edc8ea62ef2b944e18849 # this is the one that failed
>
> Both sha1sums can be found in Linus' tree.
>
> I have tested these 2 cherry-picks on top of linux-5.4.y on my board,
> and it works just fine.
>
> I was a bit concerned about backporting the LS1028A patch as a
> dependency for my fix, but I have consulted
> Documentation/process/stable-kernel-rules.rst and it says:
>
> - New device IDs and quirks are also accepted.
>
> That patch also satisfies the following:
>
> - It must be obviously correct and tested. <- check
> - It cannot be bigger than 100 lines, with context. <- check
>
> The patch does not apply because the fixes were discovered backwards.
> LS1021A and LS1028A should be compatible with one another. However
> when bringing up the LS1028A, Michael found the LPUART to be broken,
> thought the LS1021A was working, and added the FIFO size quirk as a
> LS1028A 'feature'.
That worked, now done, thanks.
greg k-h
next prev parent reply other threads:[~2020-11-09 10:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 14:23 FAILED: patch "[PATCH] tty: serial: fsl_lpuart: LS1021A has a FIFO size of 16 words," failed to apply to 5.4-stable tree gregkh
2020-11-03 22:48 ` Vladimir Oltean
2020-11-09 10:18 ` gregkh [this message]
2020-11-09 10:31 ` Vladimir Oltean
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=20201109101804.GA1065310@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=fugang.duan@nxp.com \
--cc=michael@walle.cc \
--cc=stable@vger.kernel.org \
--cc=vladimir.oltean@nxp.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox