Bug 8106 - preempt-rt patch does not apply on 3.4 kernel
Summary: preempt-rt patch does not apply on 3.4 kernel
Status: RESOLVED FIXED
Alias: None
Product: Kernel
Classification: Yocto Project Subprojects
Component: kernel-configuration (show other bugs)
Version: unspecified
Hardware: All Multiple
: Low normal
Target Milestone: Future
Assignee: Bruce Ashfield
QA Contact:
URL:
Whiteboard:
Depends on:
Blocks:
 
Reported: 2015-08-05 20:13 UTC by Cristian Bercaru
Modified: 2015-10-01 14:45 UTC (History)
2 users (show)

See Also:
OS type for building Yocto: ---
Type of Regression: Regression (Used to work)
Verified:
Documentation change: Don't know

Attachments
the apply error log (28.15 KB, text/plain)
2015-08-05 20:13 UTC, Cristian Bercaru 		no flags Details
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Cristian Bercaru 2015-08-05 20:13:16 UTC 
Created attachment 2629 [details]
the apply error log

The preempt patch does not apply on the standard/preempt-rt/base branch from git://git.yoctoproject.org/linux-yocto-3.4

$ git branch
* standard/preempt-rt/base

$ git apply preempt-rt-import-3.4.4-rt14.patch
preempt-rt-import-3.4.4-rt14.patch:66: space before tab in indent.
	 	# ping -c1 -s57 -p0102030468
error: patch failed: Documentation/kernel-parameters.txt:1126
error: Documentation/kernel-parameters.txt: patch does not apply
error: patch failed: Documentation/sysrq.txt:57
error: Documentation/sysrq.txt: patch does not apply
error: patch failed: MAINTAINERS:3081
error: MAINTAINERS: patch does not apply
[...]
Comment 1 Bruce Ashfield 2015-08-11 02:59:30 UTC 
As you guessed, this one is known. But since the 3.4 kernel is about
to be removed from master, the low priority is correct.
Comment 2 Bruce Ashfield 2015-08-21 13:56:58 UTC 
This is fixed in master via the 4.1-rt6 update. Which will be available
shortly.
Comment 3 Cristian Bercaru 2015-09-15 15:02:03 UTC 
How is the fix going?
Comment 4 Bruce Ashfield 2015-09-15 15:17:40 UTC 
(In reply to comment #3)
> How is the fix going?

Are we really talking 3.4 ? Or 3.14 ? And what release ? Since I
removed those named recipes in master, there's been no work on them
at all.

commit 61c15c03b410f645a07a1095e1a5726324d69dd1
Author: Bruce Ashfield <bruce.ashfield@windriver.com>
Date:   Thu Aug 28 10:08:18 2014 -0400

    linux-yocto/3.4: remove 3.4 name recipes
    
    Removing the 3.4 recipes, since support has not shifted to 3.10 and
    3.14 for LTSI kernel versions, with 3.16+ as the development version.
    
    (From OE-Core rev: 362aaebbeb7b241edba00dd8ea08eab07596378c)
    
    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

:100644 000000 6929dfaec198... 000000000000... D        meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
:100644 000000 bad6b8f4eb9b... 000000000000... D        meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
:100644 000000 3538afcf9809... 000000000000... D        meta/recipes-kernel/linux/linux-yocto_3.4.bb