Oscar Salvador <osalvador@xxxxxxx> writes: > On Mon, Apr 11, 2022 at 02:28:08PM +0530, Srikar Dronamraju wrote: >> Given that my patch got accepted into powerpc tree >> https://git.kernel.org/powerpc/c/e4ff77598a109bd36789ad5e80aba66fc53d0ffb >> is now part of Linus tree, this line may need a slight tweak. > > Right. > > @Michael: Will you resolve the conflict, or you would rather want me to send > v2 with the amendment? I can resolve the conflict, it should be trivial. If there's any trouble I'll let you know. cheers
