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
| ||
|
Date: Tue, 3 Jan 2017 12:27:20 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Leon Romanovsky <leon@...nel.org>, David Miller <davem@...emloft.net>, Networking <netdev@...r.kernel.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: linux-next: manual merge of the rdma-leon tree with the net-next tree Hi Leon, Today's linux-next merge of the rdma-leon tree got conflicts in: drivers/infiniband/hw/mlx5/main.c drivers/infiniband/hw/mlx5/mlx5_ib.h drivers/infiniband/hw/mlx5/mr.c drivers/infiniband/hw/mlx5/qp.c drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c drivers/net/ethernet/mellanox/mlx5/core/en_main.c drivers/net/ethernet/mellanox/mlx5/core/en_stats.h drivers/net/ethernet/mellanox/mlx5/core/eq.c drivers/net/ethernet/mellanox/mlx5/core/main.c include/linux/mlx5/device.h include/linux/mlx5/driver.h include/linux/mlx5/mlx5_ifc.h between commits in the rdma-leon tree and commits (several of whitch are the same, or similar, patches) in the net-next tree. I just dropped the rdma-leon tree for today. Please clean it up. -- Cheers, Stephen Rothwell
Powered by blists - more mailing lists