On 11/1/2011 6:54 PM, Roland Dreier wrote:
Hi Linus, Please pull from git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus This will get the main batch of changes for 3.2. One note: my tree is based on 3.1-rc9, and I have some changes to drivers/net/mlx4, but in your tree that driver has moved to drivers/net/ethernet/mellanox/mlx4. With a high enough merge.renamelimit, git handles this merge fine in my test
The following commit appears in the kernel "git log" but in not in "git log drivers/net/mlx4/main.c" nor "git log drivers/net/ethernet/mellanox/mlx4/main.c", looking on the latter code I see that the patch was actually applied on the code, just checking if this
missing log points to some other problem? Or.
commit cb29688aaa4caa4d54df2976118fe99a839bb433 Author: Or Gerlitz <[email protected]> Date: Sun Oct 16 10:26:21 2011 +0200 mlx4_core: Deprecate log_num_vlan module param Enable the maximum size (128) supported by the device for the shadow vlans table, ignoring the module parameter that overrides it. This table is only used by the IBoE control plane for setting a vlan index into an RC/UC QP context or UD Address Handle. Signed-off-by: Or Gerlitz <[email protected]> Signed-off-by: Roland Dreier <[email protected]> diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index f0ee35d..0c0c7d9 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/mlx4/main.c
-- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
