linux-kernel - linux-next: manual merge of the rdma 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20160322113319.021de191@canb.auug.org.au>
Date:	Tue, 22 Mar 2016 11:33:19 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Doug Ledford <dledford@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bhaktipriya Shridhar <bhaktipriya96@...il.com>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Hari Prasath Gujulan Elango <hgujulan@...teon.com>
Subject: linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug,

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

  drivers/staging/rdma/hfi1/verbs.c

between commit:

  e1af35bc7942 ("staging: rdma: hfi1: Use setup_timer")

from Linus' tree and commit:

  045277cf1548 ("IB/qib,staging/rdma/hfi1: use setup_timer api")

from the rdma tree.

I fixed it up (I just used the latter version) 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