Trusty meta master SRU - ensure all items are included in changelog and standardise packaging
Benjamin M Romer
benjamin.romer at canonical.com
Wed Feb 1 15:24:25 UTC 2017
I tried to apply these to trusty/linux-meta master branch and get:
$ git am ../../../patch/*
Applying: UBUNTU: simplify meta package packaging
.git/rebase-apply/patch:598: trailing whitespace.
Update to the next HWE kernel by changing HWE_KERNEL_NAME in
debian/rules.
.git/rebase-apply/patch:1045: trailing whitespace.
Priority: optional
.git/rebase-apply/patch:1053: trailing whitespace.
Priority: optional
.git/rebase-apply/patch:1077: trailing whitespace.
Priority: optional
.git/rebase-apply/patch:1085: trailing whitespace.
Priority: optional
error: patch failed: meta-source/debian/changelog:1
error: meta-source/debian/changelog: patch does not apply
Patch failed at 0001 UBUNTU: simplify meta package packaging
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Weird. I can try to fix it up or you could just rebase and resend them
to me. :)
-- Ben
More information about the kernel-team
mailing list