From: Greg KH <gregkh@linuxfoundation.org>
To: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: stable@vger.kernel.org, David Miller <davem@davemloft.net>,
mkl@pengutronix.de, netdev@vger.kernel.org,
linux-can@vger.kernel.org, kernel@pengutronix.de
Subject: Re: missing in stable 4.1.1 - was Re: pull-request: can 2015-06-21
Date: Tue, 30 Jun 2015 13:07:13 -0700 [thread overview]
Message-ID: <20150630200713.GA10747@kroah.com> (raw)
In-Reply-To: <5592EE98.8030705@hartkopp.net>
On Tue, Jun 30, 2015 at 09:31:36PM +0200, Oliver Hartkopp wrote:
> Hello Greg,
>
> On 23.06.2015 15:43, David Miller wrote:
> >From: Marc Kleine-Budde <mkl@pengutronix.de>
> >Date: Sun, 21 Jun 2015 19:04:58 +0200
> >
> >>this is a, probably too late, pull request for v4.1.
> >>
> >>Oliver Hartkopp fixed a bug in the generic CAN frame handling code, which may
> >>lead to loss of CAN frames. It was introduced during v4.1 development.
> >>
> >>Please queue via net/master if possible, net-next/master otherwise. I've added
> >>stable on Cc, just in case.
> >
> >Pulled, thanks.
>
> the patch "can: fix loss of CAN frames in raw_rcv" was sent to stable on
> 2015-06-21 but unfortunately did not find its way into 4.1.1 :-(
>
> The upstream commit is:
>
> http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=36c01245eb8046c16eee6431e7dbfbb302635fa8
>
> which slipped into 4.2 at merge window opening time.
>
> So it just got lost in the stable queue somehow.
No, it's still there. I don't queue up patches for a stable release
until they have shown up in a public release from Linus. So in this
case, it will be elgible to be in a stable kernel after 4.2-rc1 is out.
Unless you tell me otherwise, so if you want this in the next 4.1-stable
release, I can queue it up now.
thanks,
greg k-h
next prev parent reply other threads:[~2015-06-30 20:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-21 17:04 pull-request: can 2015-06-21 Marc Kleine-Budde
2015-06-21 17:04 ` [PATCH] can: fix loss of CAN frames in raw_rcv Marc Kleine-Budde
2015-06-23 13:43 ` pull-request: can 2015-06-21 David Miller
2015-06-30 19:31 ` missing in stable 4.1.1 - was " Oliver Hartkopp
2015-06-30 20:07 ` Greg KH [this message]
2015-06-30 20:28 ` Oliver Hartkopp
2015-06-30 21:04 ` Greg KH
2015-06-30 21:20 ` David Miller
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=20150630200713.GA10747@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=socketcan@hartkopp.net \
--cc=stable@vger.kernel.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
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