On Sun, Jun 9, 2019 at 4:30 PM Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> wrote: > On Sat, Jun 8, 2019 at 7:18 AM Linus Walleij <linus.walleij@xxxxxxxxxx> wrote: > > I guess I could tag on "-only" to cut down the buzz and make git > > resolution happier. > > You do not need to apply this patch. > No sense to add the equivalent changes via different trees. Hm good point, I should have looked closer to see if the same things were identical in both patches :/ Right now I can't rebase the tree since I pulled in development from submaintainers. But it's impossible to avoid stepping on each others toes when we do treewide changes so let's try to just live with the result that sometimes two patches contest about the same changes. Yours, Linus Walleij