Hi Manju, > On Oct 24, 2019, at 15:02, Manjukumar Harthikote Matha <manju...@xilinx.com> > 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
