On Mon, 3 Jun 2019 at 17:11, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > Hi Krzysztof, > > On Mon, 3 Jun 2019 16:35:22 +0200 Krzysztof Kozlowski <krzk@xxxxxxxxxx> wrote: > > > > On Mon, 3 Jun 2019 at 16:32, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > > > > > On Mon, 3 Jun 2019 16:10:40 +0200 Krzysztof Kozlowski <krzk@xxxxxxxxxx> wrote: > > > > > > > > Indeed it looks like effect of merge conflict resolution or applying. > > > > When I look at MMOTS, it is the same as yours: > > > > http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/commit/?id=b77b8cce67f246109f9d87417a32cd38f0398f2f > > > > > > > > However in linux-next it is different. > > > > > > > > Stephen, any thoughts? > > > > > > Have you had a look at today's linux-next? It looks correct in > > > there. Andrew updated his patch series over the weekend. > > > > Yes, I am looking at today's next. Both the source code and the commit > > 728e0fbf263e3ed359c10cb13623390564102881 have wrong "if (merged)" (put > > in wrong hunk). > > OK, I have replaced that commit with this: Thank you! Best regards, Krzysztof
