linux-kernel - Re: linux-next: manual merge of the rdma tree with the net-next 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <568BF7D4.8080304@mellanox.com>
Date:	Tue, 5 Jan 2016 19:05:24 +0200
From:	Or Gerlitz <ogerlitz@...lanox.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Doug Ledford <dledford@...hat.com>
CC:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Saeed Mahameed <saeedm@...lanox.com>,
	Achiad Shochat <achiad@...lanox.com>,
	Matan Barak <matanb@...lanox.com>,
	Leon Romanovsky <leonro@...lanox.com>
Subject: Re: linux-next: manual merge of the rdma tree with the net-next tree

On 1/5/2016 3:51 AM, Stephen Rothwell wrote:
> Hi Doug,
>
> Today's linux-next merge of the rdma tree got conflicts in:
>
>    drivers/net/ethernet/mellanox/mlx5/core/vport.c
>    include/linux/mlx5/mlx5_ifc.h
>    include/linux/mlx5/vport.h
>
> between commits:
>
>    e1d7d349c69d ("net/mlx5: Update access functions to Query/Modify vport MAC address")
>    e75465148b7d ("net/mlx5: Introduce access functions to modify/query vport state")
>
> from the net-next tree and commit:
>
>    e5f6175c5b66 ("net/mlx5_core: Break down the vport mac address query function")
>
> from the rdma tree and maybe some others.
>
> I have no hope of fixing this stuff up, so I have dropped the rdma tree
> again for today.  There is similar functionality being introduced in
> both trees ... please sort this mess out ...

Hi Stephen,

Saeed/Matan and Co are working here on a fix which would solve the 
conflict.

We have the basic patch and people will be testing it later/tomorrow.

Could you please advice how would it be possible to provide you the
git rerere output -- the pre-image and post-images files from .git/rr-cache?

Or.


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/