On Wed, May 11, 2022 at 04:48:38PM +0800, Xu Yilun wrote: > On Wed, May 11, 2022 at 11:33:29AM +0300, Dan Carpenter wrote: > > On Tue, May 10, 2022 at 01:00:15AM +0800, Xu Yilun wrote: > > > > > > Hi Dan & Moritz: > > > > > > Thanks for the patch. But it actually reverts Nava's patch. Since Nava's > > > patch is not pushed to linux-next yet, could we just drop it from > > > linux-fpga? > > > > I don't know if you meant linux-next. It's pushed to linux-next. But > > linux-next is rebased every day so reverting is fine as far as linux-next > > goes. > > Thanks for the info. I was not aware of that and may mess up something. > I force pushed the linux-fpga yesterday for this patchset, then linux-next > would be conflict with linux-fpga, is it? > > If it is the case, how could I remedy? No. Don't worry about linux-next. Stephen rebuilds it from scratch every day. It's fine if you rebase. There are quite a few trees which rebase. regards, dan carpenter
