Re: [meta-xilinx] merging linux-stable tags into linux-xlnx tracking branch
Hi Manju, > On Oct 24, 2019, at 15:02, Manjukumar Harthikote Matha > wrote: > > We also provide a rebase tree, this will help to see what patches we hold > on-top of a released version from mainline > https://github.com/Xilinx/linux-xlnx/tree/xlnx_rebase_v4.19 > > The above rebase tree will be easier to use for your work rather than using > merge tree from linux-xlnx. This branch indeed makes things well organized, but it doesn't change anything to my problem unfortunately. I tried it and get the very same conflicts as when trying to merge xilinx-v2019.1 with v4.19.80 You can try it yourself: git checkout xilinx/xlnx_rebase_v4.19 git fetch git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git v4.19.80 git merge FETCH_HEAD You'll get a bunch of conflicts for files that have been changed by Xilinx and by stable. Then try: git checkout xilinx-v2019.1 git fetch git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git v4.19.80 git merge FETCH_HEAD I am almost done with the conflict resolutions, but I had to botch some of the complicated ones. I could afford to do so since I don't use all the files affected. This means my work is not really useable by others. If the real maintainers of these changes did the merge, they would have much better resolution than me. Cheers! -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
Re: [meta-xilinx] merging linux-stable tags into linux-xlnx tracking branch
Hi Jean-Francois, > -Original Message- > From: meta-xilinx-boun...@yoctoproject.org boun...@yoctoproject.org> On Behalf Of Jean-Francois Dagenais > Sent: Thursday, October 24, 2019 10:16 AM > To: meta-xilinx@yoctoproject.org > Subject: [meta-xilinx] merging linux-stable tags into linux-xlnx tracking > branch > > Hi guys, > > We track linux-xlnx master trunk, which tracks linus' main trunk. (i.e. Xilinx > merges actual linux mainline tags into their master) > > This is great since it allows us to put our work on our master, and then be > compatible with future linux versions by simple merge of Xilinx's tree. Good > job > Xilinx! > > Now, problem is, when one wants to release in the field, he should apply the > latest stable fixes to his tree. Otherwise, as Greg insistently points out: > https://youtu.be/HeeoTE9jLjM?t=1350 "you are running an insecure system." > > Right now, I am on 2019.1 which means kernel 4.19. I went ahead and created a > mymaster-4.19 which will contain merges of mymaster and stable/linux-4.19.y > from Greg's tree (as of today: v4.19.80). > > This should work without much conflicts, but of course, I'm not getting a > freebie > today either. I get tons of conflicts which are Xilinx changes which conflict > with > 4.19.y stable fixes. > > Some are trivial, some truely aren't. And then I think, hey, why am I the > "first" to > be doing this... we should all be in this situation right? > > So is there a repo out there, where kind souls have exposed the conflict > resolution work done? We also provide a rebase tree, this will help to see what patches we hold on-top of a released version from mainline https://github.com/Xilinx/linux-xlnx/tree/xlnx_rebase_v4.19 The above rebase tree will be easier to use for your work rather than using merge tree from linux-xlnx. Thanks, Manju <...> -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
[meta-xilinx] merging linux-stable tags into linux-xlnx tracking branch
Hi guys, We track linux-xlnx master trunk, which tracks linus' main trunk. (i.e. Xilinx merges actual linux mainline tags into their master) This is great since it allows us to put our work on our master, and then be compatible with future linux versions by simple merge of Xilinx's tree. Good job Xilinx! Now, problem is, when one wants to release in the field, he should apply the latest stable fixes to his tree. Otherwise, as Greg insistently points out: https://youtu.be/HeeoTE9jLjM?t=1350 "you are running an insecure system." Right now, I am on 2019.1 which means kernel 4.19. I went ahead and created a mymaster-4.19 which will contain merges of mymaster and stable/linux-4.19.y from Greg's tree (as of today: v4.19.80). This should work without much conflicts, but of course, I'm not getting a freebie today either. I get tons of conflicts which are Xilinx changes which conflict with 4.19.y stable fixes. Some are trivial, some truely aren't. And then I think, hey, why am I the "first" to be doing this... we should all be in this situation right? So is there a repo out there, where kind souls have exposed the conflict resolution work done? Thanks for your help and input guys! -- ___ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
