Hi Greg, On Tue, 15 Jul 2014 17:42:02 -0700 Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > On Wed, Jul 16, 2014 at 10:24:14AM +1000, Stephen Rothwell wrote: > > > > On Tue, 15 Jul 2014 16:17:11 -0700 Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > > > > > 3.15-stable review patch. If anyone has any objections, please let me know. > > > > > > ------------------ > > > > > > From: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx> > > > > > > commit 8bec751bd63847b4044aab8b215db52aa6abde61 upstream. > > > > > > Fix breakage introduced by > > > commit c557d392fbf5badd693ea1946a4317c87a26a716, > > > 'serial: Test for no tx data on tx restart'. > > > > That commit only entered Linus' tree at v3.16-rc5, so this fix > > shouldn't need to go into 3.15-stable (unless the original patch was > > backported as well - in which case maybe the backport commit id should > > be mentioned as well). > > c557d392fbf5badd693ea1946a4317c87a26a716, is marked for stable (and is > earlier in the series) so leaving this as-is, should be fine, as that > commit id will show up in the stable kernels as well in the changelog > entry. Ah, ok. So you don't merge "fixes for fixes" to save bisection problems, then? (Just asking) -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
signature.asc
Description: PGP signature