linux-kernel - linux-next: manual merge of the char-misc tree with Linus' 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20200727174633.40fd8f15@canb.auug.org.au>
Date:   Mon, 27 Jul 2020 17:46:33 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Oded Gabbay <oded.gabbay@...il.com>,
        Ofir Bitton <obitton@...ana.ai>
Subject: linux-next: manual merge of the char-misc tree with Linus' tree

Hi all,

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

  drivers/misc/habanalabs/common/command_submission.c

between commit:

  cea7a0449ea3 ("habanalabs: prevent possible out-of-bounds array access")

from Linus' tree and commit:

  3abc99bb7dcb ("habanalabs: configure maximum queues per asic")

from the char-misc tree.

I fixed it up (I used parts of each that no longer conflict) 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