Hi Jean-Francois,
> -----Original Message----- > From: [email protected] <meta-xilinx- > [email protected]> On Behalf Of Jean-Francois Dagenais > Sent: Thursday, October 24, 2019 10:16 AM > To: [email protected] > 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 [email protected] https://lists.yoctoproject.org/listinfo/meta-xilinx
