Hi Kamil, On Mon, 3 Jul 2017 18:43:32 +0200 Kamil Rytarowski <n...@gmx.com> wrote: > > Am I expected to do it myself and resend a new patch?
No, this conflict is not very hard to fix up, so Linus just needs to be told it exists as a courtesy. -- Cheers, Stephen Rothwell