netdev - linux-next: manual merge of the akpm-current tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20190205162512.696c2c3b@canb.auug.org.au>
Date:   Tue, 5 Feb 2019 16:25:12 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kent Overstreet <kent.overstreet@...il.com>,
        Xin Long <lucien.xin@...il.com>
Subject: linux-next: manual merge of the akpm-current tree with the net tree

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  net/sctp/stream.c

between commit:

  cfe4bd7a257f ("sctp: check and update stream->out_curr when allocating stream_out")

from the net tree and commit:

  2bd3fbb3ff23 ("sctp: convert to genradix")

from the akpm-current tree.

I fixed it up (the latter removed the code modified by the former, so I
did that) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped