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  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:   Mon, 20 Feb 2017 13:51:31 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Bart Van Assche <bart.vanassche@...il.com>,
        "Nicholas A. Bellinger" <nab@...ux-iscsi.org>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Varun Prakash <varun@...lsio.com>
Subject: linux-next: manual merge of the target-bva tree with the
 target-updates tree

Hi Bart,

Today's linux-next merge of the target-bva tree got conflicts in:

  drivers/target/iscsi/cxgbit/cxgbit_target.c
  drivers/target/iscsi/iscsi_target.c
  include/target/iscsi/iscsi_transport.h

between commits:

  9a584bf9bf0a ("target/iscsi: split iscsit_check_dataout_hdr()")
  79e57cfe00f4 ("target/cxgbit: add T6 iSCSI DDP completion feature")

from the target-updates tree and commit:

  b6f2cd5ab404 ("target/iscsi: split iscsit_check_dataout_hdr()")
  b0d5eab94c37 ("target/cxgbit: add T6 iSCSI DDP completion feature")

from the target-bva tree.

I fixed it up (the target-update versions are updates from the others,
so I used those) 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

Powered by blists - more mailing lists