netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
To: saeedm-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org
Cc: dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
	netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org
Subject: Re: [pull request][for-next 0/8] Mellanox, mlx5 shared 2017-08-07
Date: Mon, 07 Aug 2017 11:20:52 -0700 (PDT)	[thread overview]
Message-ID: <20170807.112052.332868856082904160.davem@davemloft.net> (raw)
In-Reply-To: <20170807101808.22924-1-saeedm-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>

From: Saeed Mahameed <saeedm-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
Date: Mon,  7 Aug 2017 13:18:00 +0300

> Hi Dave & Doug,
> 
> This series contains some low level updates for mlx5 core driver,
> to be shared as base code for net-next and rdma for-next mlx5
> 4.14 submissions.
> 
> Please find more information in the tag message below.
> 
> Please pull and let me know if there's any porblem.
> 
> Side note:
> This series merges cleanly with current net-next, but it will conflict with Jiri's patch
> "mlx5e: push cls_flower and mqprio setup_tc processing into separate functions"
> Which is under review.
> since this is shared code and must go to both rdma and net-next it has to be
> based on 4.13-rc4, so there is not much I can do about this.

I resolved the merge conflict as best as I could, please take a look.

Pulled, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2017-08-07 18:20 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-07 10:18 [pull request][for-next 0/8] Mellanox, mlx5 shared 2017-08-07 Saeed Mahameed
2017-08-07 10:18 ` [for-next 1/8] net/mlx5e: Rearrange netdevice ops structures Saeed Mahameed
2017-08-07 10:18 ` [for-next 2/8] net/mlx5e: NIC netdev init flow cleanup Saeed Mahameed
2017-08-07 10:18 ` [for-next 5/8] net/mlx5: Add CONFIG_MLX5_ESWITCH Kconfig Saeed Mahameed
2017-08-07 10:18 ` [for-next 6/8] net/mlx5: Delay events till ib registration ends Saeed Mahameed
2017-08-07 10:18 ` [for-next 7/8] net/mlx5: Fix counter list hardware structure Saeed Mahameed
     [not found] ` <20170807101808.22924-1-saeedm-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
2017-08-07 10:18   ` [for-next 3/8] net/mlx5: Unify vport manager capability check Saeed Mahameed
2017-08-07 10:18   ` [for-next 4/8] net/mlx5: Separate between E-Switch and MPFS Saeed Mahameed
2017-08-07 10:18   ` [for-next 8/8] net/mlx5: Increase the maximum flow counters supported Saeed Mahameed
2017-08-07 18:20   ` David Miller [this message]
     [not found]     ` <20170807.112052.332868856082904160.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2017-08-07 19:31       ` [pull request][for-next 0/8] Mellanox, mlx5 shared 2017-08-07 Saeed Mahameed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170807.112052.332868856082904160.davem@davemloft.net \
    --to=davem-ft/pcqaiutieiz0/mpfg9q@public.gmane.org \
    --cc=dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org \
    --cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=saeedm-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).