On Thu, 17 Oct 2019 11:27:09 +0800, tanhuazhong wrote: > On 2019/10/17 1:50, David Miller wrote: > > From: Jakub Kicinski <jakub.kicin...@netronome.com> > > Date: Wed, 16 Oct 2019 10:19:43 -0700 > > > >> On Wed, 16 Oct 2019 15:16:59 +0800, Huazhong Tan wrote: > >>> This patch-set includes some bugfixes and code optimizations > >>> for the HNS3 ethernet controller driver. > >> > >> The code LGTM, mostly, but it certainly seems like patches 2, 3 and 4 > >> should be a separate series targeting the net tree :( > > > > Agreed, there are legitimate bug fixes. > > > > I have to say that I see this happening a lot, hns3 bug fixes targetting > > net-next in a larger series of cleanups and other kinds of changes. > > > > Please handle this delegation properly. Send bug fixes as a series > > targetting > > 'net', and send everything else targetting 'net-next'. > > > > Hi, David & Jakub. > > BTW, patch01 is a cleanup which is needed by patch02, > if patch01 targetting 'net-next', patch02 targetting 'net', > there will be a gap again. How should I deal with this case?
You'll need to reorder the cleanup so that the fixes apply to the unmodified net tree. Then preferably wait for the net tree to be merged back to net-next before posting the cleanup that'd conflict. If the conflict is not too hard to resolve you can just post the net-next patches and give some instructions on how to resolve the merge conflict under the --- lines in the commit message.
