linux-kernel - Re: linux-next: manual merge of the net-next 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <0f612db3-9ac8-0e8d-0437-5cc1243db326@linux.ibm.com>
Date:   Wed, 2 Dec 2020 11:13:16 -0600
From:   Thomas Falcon <tlfalcon@...ux.ibm.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Jakub Kicinski <kuba@...nel.org>
Cc:     "Dwip N. Banerjee" <dnbanerg@...ibm.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with the net tree

On 12/1/20 7:20 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
>    drivers/net/ethernet/ibm/ibmvnic.c
>
> between commit:
>
>    b71ec9522346 ("ibmvnic: Ensure that SCRQ entry reads are correctly ordered")
>
> from the net tree and commit:
>
>    ec20f36bb41a ("ibmvnic: Correctly re-enable interrupts in NAPI polling routine")
>
> from the net-next tree.
>
> I fixed it up (see below) 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.
>
Hi, Stephen, thank you for fixing that conflict. Sorry for the 
inconvenience.