linux-kernel - linux-next: manual merge of the akpm-current tree with the scsi 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-next>] [day] [month] [year] [list]

Message-ID: <20180620135458.7cc22318@canb.auug.org.au>
Date:   Wed, 20 Jun 2018 13:54:58 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        James Bottomley <James.Bottomley@...senPartnership.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
        Matthew Wilcox <willy@...radead.org>,
        "Martin K. Petersen" <martin.petersen@...cle.com>
Subject: linux-next: manual merge of the akpm-current tree with the scsi
 tree

Hi all,

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

  lib/percpu_ida.c

between commit:

  acf3ff616ee2 ("scsi: Remove percpu_ida")

from the scsi tree and commit:

  0c4d6e08c775 ("lib/percpu_ida.c: don't do alloc from per-CPU list if there is none")

from the akpm-current tree.

I fixed it up (I just removed the file, but clearly the akpm-current
tree commit could be removed) 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