On Thu, Jul 18, 2019 at 9:36 AM Bruce Ashfield <bruce.ashfi...@gmail.com> wrote: > > On Thu, Jul 18, 2019 at 8:30 AM Michal Simek <michal.si...@xilinx.com> wrote: > > > > On 16. 07. 19 21:44, Bruce Ashfield wrote: > > > On Mon, Jul 15, 2019 at 2:19 AM Wei, Yunguo <yunguo....@windriver.com> > > > wrote: > > >> > > >> > > >> On 7/8/2019 9:14 PM, Bruce Ashfield wrote: > > >>> On Thu, Jul 4, 2019 at 5:59 AM <quanyang.w...@windriver.com> wrote: > > >>>> From: Quanyang Wang <quanyang.w...@windriver.com> > > >>>> > > >>>> Hi Bruce, > > >>>> > > >>>> I am working on BSP xilinx-zynqmp. > > >>>> > > >>>> Could you please help to merge these patches to: > > >>>> > > >>>> linux-yocto-dev standard/xilinx-zynqmp > > >>>> > > >>>> These patches are picked from: > > >>>> > > >>>> https://github.com/Xilinx/linux-xlnx.git xlnx_rebase_v4.19 > > >>> We already have a 4.19 branch based on Michal's tree, which was > > >>> curated and selected for the soc support. > > >>> Did you you look at the one in linux-yocto 4.19 ? Since it is a > > >>> specifically selected set of patches and might be a better starting > > >>> point. > > >>> > > >>> Before I introduce a 5.x branch, I'd want to hear his opinion on the > > >>> branch and the selections that you made, versus what he would have > > >>> done. > > >> > > >> Hi Bruce, Michal, > > >> > > >> Any further comments on it? > > >> > > > > > > I'll try getting comments from Michal via another method, he may be on > > > vacation. I'd still like to hear from him. > > > > > > But generally speaking, since the base is the same, I have no issues > > > with the branch. I'll likely call the branch the same as we have in > > > 4.19, but otherwise, will leave things as they are. > > > > Xilinx is going to stay at 4.19 for the whole 2019 and new patches are > > coming to our master branch and then they will be propagated to rebased > > branch. After the initial patchset adding new patches is easy. > > It means at some point in future I will sync current master with rebase > > branch and ask you for adding these patches to yocto tree too. > > If there is any immediate need to add/fix something there we can do it > > earlier. > > Please let me know what you think. I should be back in August. > > No issues on my end, that strategy works for me. > > I'll create the -dev (5.2) branches and stage the patches there. > Incremental updates are fine, and we can handle them as they come.
See the standard/xlnx-soc branch in the -dev kernel for the results of the merge. Bruce > > Cheers, > > Bruce > > > > > Thanks, > > Michal > > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
