[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 15:59) Bruce Ashfield wrote:

> 
> 
> On Wed, May 15, 2019 at 6:07 PM Paul Gortmaker <paul.gortmaker at windriver.com>
> wrote:
> 
>     Bruce, Yocto kernel folks:
> 
>     Here is the next 4.18.x stable update "extension" primarily created
>     for the Yocto project, continuing from the previous v4.18.37 release.

[...]

>     There is a slight bias towards networking in the content here; it seems
>     in v4.19, an ipv6 frag issue was best resolved by importing work that
>     combined some ipv4/ipv6 code first.  And for 4.18 here, I had to extend
>     that slightly by getting some related commits between 4.18 and 4.19.
>     But after doing that, the related commits played nice together during
>     application, and some basic ping6 tests didn't reveal any issues.

[...]

> v4.18.37 merged without problems, but I'm seeing something off with the .38
> tag:
> 
> CONFLICT (content): Merge conflict in net/ipv6/netfilter/nf_conntrack_reasm.c
> CONFLICT (content): Merge conflict in net/ipv4/ip_fragment.c
> CONFLICT (content): Merge conflict in net/ipv4/inet_fragment.c
> CONFLICT (content): Merge conflict in include/net/inet_frag.h

Heh, not too surprising, given my net/frag comment above.

> 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.

Paul.
--
> 
> Bruce
>