Hi Saul: Just discussed w/ Shuicheng , we think rebase including manually fix conflict should be fine. You don’t need to build-iso to verify the rebase work. We can fix any issue caused by rebase together.
Thanks. BR Austin Sun.
-----Original Message----- From: Saul Wold sgw@linux.intel.com Sent: Tuesday, February 4, 2020 1:50 PM To: starlingx-discuss@lists.starlingx.io Subject: Re: [Starlingx-discuss] rebase f/centos8 branch
On 2/3/20 6:41 PM, Sun, Austin wrote:
Hi Saul: When do you think rebase will be ready ?
Austin,
Part of the challenge is that I can't download all the RPM/tarballs and build the parts that have potential conflicts, like the kernel with the Mellanox changes that Jim pushed to master recently.
I could possibly do a git rebase instead of a git merge, that will change the f/centos8 branch's history and require all the developers working on f/centos8 to re-pull and possibly redo some work, or save their patches and re-apply them to the rebased branch. 2 different workflows, one easier for me (rebase) or easier for developers to track (merge).
Sau!
Thanks. BR Austin Sun.
-----Original Message----- From: Sun, Austin Sent: Saturday, February 1, 2020 9:20 AM To: 'Penney, Don' Don.Penney@windriver.com; Saul Wold sgw@linux.intel.com; starlingx-discuss@lists.starlingx.io Subject: RE: [Starlingx-discuss] rebase f/centos8 branch
Thanks Penny , Al and Saul. BR Austin Sun.
-----Original Message----- From: Penney, Don Don.Penney@windriver.com Sent: Friday, January 31, 2020 10:51 PM To: Sun, Austin austin.sun@intel.com; Saul Wold sgw@linux.intel.com; starlingx-discuss@lists.starlingx.io Subject: RE: [Starlingx-discuss] rebase f/centos8 branch
The cherry-pick of Al's fix has merged in f/centos8: https://review.opendev.org/704862
-----Original Message----- From: Sun, Austin [mailto:austin.sun@intel.com] Sent: Friday, January 31, 2020 3:49 AM To: Saul Wold; starlingx-discuss@lists.starlingx.io Subject: Re: [Starlingx-discuss] rebase f/centos8 branch
Thanks Saul. From my opinion , we can cherry-pick pylint change to f/centos8 . Which master base are you using ? shall we wait layer builder change be merged on mainline if layer builder changes will be merged soon ? , or it is already in baseline ?
Thank. BR Austin Sun. -----Original Message----- From: Saul Wold sgw@linux.intel.com Sent: Friday, January 31, 2020 7:44 AM To: starlingx-discuss@lists.starlingx.io Subject: Re: [Starlingx-discuss] rebase f/centos8 branch
A quick update.
Due to stx-tools downloads lst files merging before the upgrades merged, I have more work to download the older versions first in order to do some testing of the kernel changes.
Another option would be to cherry-pick the pylint change to f/centos8, I think that might be a better option at this point to unblock us.
Sau!
On 1/29/20 8:26 PM, Saul Wold wrote:
On 1/29/20 8:18 PM, Lin, Shuicheng wrote:
Hi Saul,
CentOS 8 feature branch also needs below patch, otherwise all patches in integ repo cannot be merged.
https://review.opendev.org/704566
Please help rebase master patches to CentOS 8 feature branch.
Yes, I am ware of this, I started the rebase this afternoon this one is more complex and I need to do some build testing before I can merge.
Sau!
Thanks.
Best Regards
Shuicheng
*From:* Sun, Austin austin.sun@intel.com *Sent:* Thursday, January 30, 2020 10:53 AM *To:* starlingx-discuss@lists.starlingx.io *Subject:* [Starlingx-discuss] rebase f/centos8 branch
Hi Saul :
Because mainline has merged some kernel fix , kata feature and some other fixes . would you like to rebase f/centos8 branch from master now ?
Thanks.
BR Austin Sun.
Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss
Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss
Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss _______________________________________________ Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss _______________________________________________ Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss
_______________________________________________ Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss