linux-kernel - linux-next: manual merge of the target-updates tree with the rdma 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]

Date:	Fri, 8 Jan 2016 15:34:57 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Nicholas A. Bellinger" <nab@...ux-iscsi.org>,
	Doug Ledford <dledford@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Or Gerlitz <ogerlitz@...lanox.com>
Subject: linux-next: manual merge of the target-updates tree with the rdma
 tree

Hi Nicholas,

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

  drivers/infiniband/ulp/isert/ib_isert.c

between commit:

  4a061b287b1e ("IB/ulps: Avoid calling ib_query_device")

from the rdma tree and commit:

  373a4cd73782 ("iser-target: Fix non negative ERR_PTR isert_device_get usage")

from the target-updates tree.

I fixed it up (the former removed the code fixed up by the latter)
and can carry the fix as necessary (no action
is required).



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