linux-kernel - linux-next: build failure after merge of 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: <20111215125818.f9ffb338c0085f2ba9908a42@canb.auug.org.au>
Date:	Thu, 15 Dec 2011 12:58:18 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	James Bottomley <James.Bottomley@...senPartnership.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: build failure after merge of the scsi tree

Hi James,

After merging the scsi tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/scsi/qla4xxx/ql4_os.c:2135:6: error: redefinition of 'qla4xxx_check_relogin_flash_ddb'
drivers/scsi/qla4xxx/ql4_os.c:2081:6: note: previous definition of 'qla4xxx_check_relogin_flash_ddb' was here

Caused by a bad automatic merge when I merged the scsi tree today.  The
patch "[SCSI] qla4xxx: fix flash/ddb support" appears in both the scsi
and scsi-rc-fixes tree (as separate commits) and git has messed up the
merge.  I fixed it up by using the version of this file from the scsi
tree.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped