Re: FAILED: patch "[PATCH] libceph: fix double __remove_osd() problem" failed to apply to 3.10-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Mar 04, 2015 at 08:07:03PM +0300, Ilya Dryomov wrote:
> On Wed, Mar 4, 2015 at 6:20 PM, Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
> > On Wed, Mar 04, 2015 at 10:36:14AM +0300, Ilya Dryomov wrote:
> >> On Wed, Mar 4, 2015 at 7:54 AM,  <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
> >> >
> >> > The patch below does not apply to the 3.10-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@xxxxxxxxxxxxxxx>.
> >>
> >> Hi Greg,
> >>
> >> This one needs 7c6e6fc53e73 and cc9f1f518cec cherry-picked, as noted
> >> with stable tags, both for 3.10 and 3.14.
> >
> > Those patches do not apply to those stable trees, which is why I didn't
> > add them.  Please provide a backport of all 3 patches and I will queue
> > them up.
> 
> Hmm, it all applies and builds fine here:
> 
> $ git checkout v3.10.70
> HEAD is now at ef16065a9e97... Linux 3.10.70
> $ for i in $(cat ../stable-queue/queue-3.10/series); do cat
> ../stable-queue/queue-3.10/$i >>/tmp/patches; done
> $ git am /tmp/patches
> Applying: Bluetooth: ath3k: workaround the compatibility issue with
> xHCI controller
> Applying: xfs: ensure buffer types are set correctly
> ...
> Applying: blk-throttle: check stats_cpu before reading it from sysfs
> Applying: x86, mm/ASLR: Fix stack randomization on 64-bit systems
> $ git format-patch --stdout 7c6e6fc53e73~1..7c6e6fc53e73 >/tmp/prereq1
> $ git format-patch --stdout cc9f1f518cec~1..cc9f1f518cec >/tmp/prereq2
> $ git format-patch --stdout 7eb71e0351fb~1..7eb71e0351fb >/tmp/actual
> $ git am /tmp/prereq1
> Applying: libceph: assert both regular and lingering lists in __remove_osd()
> $ git am /tmp/prereq2
> Applying: libceph: change from BUG to WARN for __remove_osd() asserts
> $ git am /tmp/actual
> Applying: libceph: fix double __remove_osd() problem
> 
> Same for v3.14.34.

Odd, I must have tried applying these backwards, it worked fine this
time, sorry for the noise.  Now queued up.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]