On Tue, Nov 10, 2020 at 2:24 PM Peilin Ye <yepeilin.cs@xxxxxxxxx> wrote: > > On Tue, Nov 10, 2020 at 01:49:46PM +0100, Daniel Vetter wrote: > > Peilin, can you pls resend this together with all the other pending > > patches from you? I think that's better than me trying to cherry-pick the > > bits we decided to keep from random places. > > Oh, are we doing an -rc3 backmerge soon? At the moment I can base these > patches on neither drm-misc (due to the font_copy removal), nor mainline > (due to the signedness issue in font_desc we've talked about), so I'm > waiting for a backmerge to rebase everything properly. Sorry that I > didn't mention earlier. linux-next has all the trees, so you can always use that. And yes I'm pushing the backmerge through, so in a few days at most I can pull in all your patches. Meanwhile you can base your work of linux-next. > > Greg, ok if I just pull these in through drm-misc-next? It's a pretty bad > > hairball anyway and that avoids the tree coordination issues. Only thing > > that might get in the way is the vt font_copy removal, but that's in -rc3 > > so easy to backmerge. > > I will rebase and send everything (including the font_copy > garbage-collecting) in a v3 series after the backmerge. Thanks, No need to be blocked on a backmerge, this is only needed for merging the patches. Development should not be blocked like this. -Daniel > > Peilin Ye > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
