[linux-yocto] v4.18.x - stable updates comprising v4.18.38

[Paul Gortmaker]

[Re: v4.18.x - stable updates comprising v4.18.38] On 16/05/2019 (Thu 16:47) Paul Gortmaker wrote:

[...]

> > The conflicts just look like one of the changes is already in my tree .. which
> > IIRC is the case, but it would be great if you could check the latest branches
> > and confirm the commit I should revert before merging this.
> 
> OK -- I'll have a look at doing the merge locally and let you know.

Your guess is correct, but it is three duplicates and not just one.

So, if we look at 4.18/standard base and run:

   git log --oneline --no-merges  ^v4.18.37 HEAD  net/ipv4/

   ecf31c809599 ip: frags: fix crash in ip_do_fragment()
   02fc22c5eb30 ip: use rb trees for IP frag queue.
   7a9f904c49aa ip: discard IPv4 datagrams with overlapping segments.

These are all part of the 4.18.38 content, but it appears that these
earlier backports in Yocto were done w/o stacking the dependencies
underneath so that they could be used as-is.  Apparently that meant
git-merge wasn't able to recognize the duplicated content, leading to a
needlessly complex merge.

However, nothing is stacked on top of them, so a LIFO rewind as:

   git revert ecf31c809599
   git revert 02fc22c5eb30
   git revert 7a9f904c49aa

...then allows a "git merge v4.18.38" to be 100% conflict free.

Paul.