On 2016-09-30 5:32 PM, Cal Sullivan wrote:
On 09/30/2016 01:51 PM, Bruce Ashfield wrote:
On 2016-09-30 4:46 PM, California Sullivan wrote:
Hi Bruce, Saul,
A while back before we created the standard/intel/base branches some
patches that were not appropriate for standard/base were merged into
the branch and caused bug [YOCTO #9587]. This patch set aims to fix
that.
The first patch reverts the inappropriate patches in standard/base. The
second patch reverts the revert and is intended for standard/intel/base
after the first revert patch waterfalls into it.
I know this is kind of kludgey but I believe its the right thing to do.
Let me know if you think otherwise.
I can do the individual reverts, rather than via a single patch. Just
provide the commit IDs (which you did in your email, so that is fine).
I can then apply those same changes to standard/intel/base again. That
way we keep a 1:1 commit granularity.
If git objects, I can go the route of these patches :D
Bruce
That will work!
I forgot to mention, this is intended for the 4.1 tree. The 4.4 tree has
more inappropriate patches and their order matters. Here are the commit
IDs in an order that reverted cleanly for me:
4086f8c349569926fd8fbe967ec24bdeabc79f95
0148b3601f29b159b4f84c1478ff1859bbd48efe
08943f2bbd507f8b7f5ef101ccc4755cbec79aad
a517d5b72e764ec22f0055edeb685c102051239e
cd83f4095b234652ae65321f35700f7e3441f0f9
I was able to do the reverts for 4.1 and 4.4 in standard/base and then
cherry pick the same commits back into standard/intel/base,
standard/preempt-rt/intel/base and standard/tiny/intel/base
This is along with some -stable updates that I have staged, so we'll
need those to get these changes.
If anything is broken, send patches or exact sequences of commits to
revert/cherry-pick.
Cheers,
Bruce
Thanks,
Cal
Thanks,
Cal
California Sullivan (2):
Revert Upstream-status: Inappropriate commits in standard/base
Reapply Upstream-status: Inappropriate commits removed from
standard/base
--
_______________________________________________
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
