linux-kernel - linux-next: manual merge of the bitmap tree with the dmaengine 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: <20211123145004.6018b7fe@canb.auug.org.au>
Date:   Tue, 23 Nov 2021 14:50:04 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Yury Norov <yury.norov@...il.com>, Vinod Koul <vkoul@...nel.org>
Cc:     Christophe JAILLET <christophe.jaillet@...adoo.fr>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the bitmap tree with the dmaengine tree

Hi all,

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

  drivers/dma/ti/edma.c

between commit:

  365fceecd66e ("dmaengine: ti: edma: Use 'for_each_set_bit' when possible")

from the dmaengine tree and commit:

  523f4c8e86c3 ("all: replace find_next{,_zero}_bit with find_first{,_zero}_bit where appropriate")

from the bitmap tree.

I fixed it up (I just used the former verion) 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