From: Leon Romanovsky <leon-DgEjT+Ai2ygdnm+yROfE0A@public•gmane.org>
To: Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public•gmane.org>
Cc: Saeed Mahameed
<saeedm-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public•gmane.org>,
David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public•gmane.org>,
Saeed Mahameed <saeedm-VPRAkNaXOzVWk0Htik3J/w@public•gmane.org>,
Linux Netdev List
<netdev-u79uwXL29TY76Z2rM5mHXA@public•gmane.org>,
linux-rdma-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
ilyal-VPRAkNaXOzVWk0Htik3J/w@public•gmane.org,
artemyko-VPRAkNaXOzVWk0Htik3J/w@public•gmane.org
Subject: Re: [PATCH for-next V2 00/11] Mellanox mlx5 core and ODP updates 2017-01-01
Date: Tue, 24 Jan 2017 21:58:20 +0200 [thread overview]
Message-ID: <20170124195820.GL6005@mtr-leonro.local> (raw)
In-Reply-To: <1485286799.43764.49.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
[-- Attachment #1: Type: text/plain, Size: 3060 bytes --]
On Tue, Jan 24, 2017 at 02:39:59PM -0500, Doug Ledford wrote:
> On Tue, 2017-01-03 at 09:23 +0200, Leon Romanovsky wrote:
> > On Tue, Jan 03, 2017 at 01:30:16AM +0200, Saeed Mahameed wrote:
> > >
> > > On Mon, Jan 2, 2017 at 10:53 PM, David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public•gmane.org>
> > > wrote:
> > > >
> > > > From: Saeed Mahameed <saeedm-VPRAkNaXOzVWk0Htik3J/w@public•gmane.org>
> > > > Date: Mon, 2 Jan 2017 11:37:37 +0200
> > > >
> > > > >
> > > > > The following eleven patches mainly come from Artemy Kovalyov
> > > > > who expanded mlx5 on-demand-paging (ODP) support. In addition
> > > > > there are three cleanup patches which don't change any
> > > > > functionality,
> > > > > but are needed to align codebase prior accepting other patches.
> > > >
> > > > Series applied to net-next, thanks.
> > >
> > > Whoops,
> > >
> > > This series was meant as a pull request, you can blame it on me I
> > > kinda messed up the V2 title.
> > > Doug will have to pull same patches later, will this produce a
> > > conflict on merge window ?
> >
> > Yes, but it can be easily avoided.
> >
> > Doug,
> >
> > We have another pull request to send and we will base its code on the
> > Dave's tree instead of Linus's rc tag. In such way, you will have the
> > same commits as Dave and won't have merge failures.
> >
> > Please don't apply manually this specific patchset.
> >
> > Sorry for the inconvenience.
>
> Hi Leon and Saeed,
>
> As I understand it, Dave took this series, but I have not. You were
> going to base another pull request on top of this so I could get both.
We did it, ODP was our first pull request and 4K UAR was second one.
http://marc.info/?l=linux-rdma&m=148398855416090&w=2
Dave pulled this tag:
https://git.kernel.org/cgit/linux/kernel/git/mellanox/linux.git/tag/?h=mlx5-4kuar-for-4.11
Since 4K UAR tag was based on ODP, by pulling mlx5-4kuar-for-4.11 tag you
will get ODP too.
> However, I believe that was the attempt to reorg the driver pull
> request, which David NAKed.
It was our third pull request
http://marc.info/?l=linux-rdma&m=148424983101796&w=2
https://git.kernel.org/cgit/linux/kernel/git/mellanox/linux.git/tag/?h=mlx5-dir-layout-reorg
> That means I have not picked this up. Are
> all of the other for-next patches you posted against the RDMA list
> going to go in cleanly without this series, or should I expect
> conflicts between Dave's tree and my own?
All patches sent by me are based on mlx5-4kuar-for-4.11 tag which
exists in Dave's tree and everything will apply cleanly on your
k.o/for-4.11 branch and won't have merge conflicts between your tree and
Dave's net-next tree.
For you convenience, my submission queue can be found at:
https://git.kernel.org/cgit/linux/kernel/git/leon/linux-rdma.git/log/?h=rdma-next
Thanks
>
> --
> Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public•gmane.org>
> GPG KeyID: B826A3330E572FDD
>
> Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2017-01-24 19:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-02 9:37 [PATCH for-next V2 00/11] Mellanox mlx5 core and ODP updates 2017-01-01 Saeed Mahameed
2017-01-02 9:37 ` [PATCH for-next V2 02/11] IB/mlx5: Reorder code in query device command Saeed Mahameed
2017-01-02 9:37 ` [PATCH for-next V2 03/11] IB/mlx5: Add helper mlx5_ib_post_send_wait Saeed Mahameed
2017-01-02 9:37 ` [PATCH for-next V2 05/11] IB/mlx5: Refactor UMR post send format Saeed Mahameed
2017-01-02 9:37 ` [PATCH for-next V2 08/11] net/mlx5: Update PAGE_FAULT_RESUME layout Saeed Mahameed
2017-01-02 9:37 ` [PATCH for-next V2 09/11] {net,IB}/mlx5: Refactor page fault handling Saeed Mahameed
2017-01-02 9:37 ` [PATCH for-next V2 10/11] IB/mlx5: Add ODP atomics support Saeed Mahameed
[not found] ` <1483349868-11716-1-git-send-email-saeedm-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
2017-01-02 9:37 ` [PATCH for-next V2 01/11] net/mlx5: Fix offset naming for reserved fields in hca_cap_bits Saeed Mahameed
2017-01-02 9:37 ` [PATCH for-next V2 04/11] net/mlx5: Support new MR features Saeed Mahameed
2017-01-02 9:37 ` [PATCH for-next V2 06/11] IB/mlx5: Add support for big MRs Saeed Mahameed
2017-01-02 9:37 ` [PATCH for-next V2 07/11] IB/mlx5: Add MR cache for large UMR regions Saeed Mahameed
2017-01-02 9:37 ` [PATCH for-next V2 11/11] IB/mlx5: Improve MR check Saeed Mahameed
2017-01-02 20:53 ` [PATCH for-next V2 00/11] Mellanox mlx5 core and ODP updates 2017-01-01 David Miller
2017-01-02 23:30 ` Saeed Mahameed
2017-01-03 7:23 ` Leon Romanovsky
[not found] ` <20170103072344.GF12077-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
2017-01-24 19:39 ` Doug Ledford
[not found] ` <1485286799.43764.49.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-01-24 19:58 ` Leon Romanovsky [this message]
2017-01-24 20:57 ` Doug Ledford
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=20170124195820.GL6005@mtr-leonro.local \
--to=leon-dgejt+ai2ygdnm+yrofe0a@public$(echo .)gmane.org \
--cc=artemyko-VPRAkNaXOzVWk0Htik3J/w@public$(echo .)gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public$(echo .)gmane.org \
--cc=dledford-H+wXaHxf7aLQT0dZR+AlfA@public$(echo .)gmane.org \
--cc=ilyal-VPRAkNaXOzVWk0Htik3J/w@public$(echo .)gmane.org \
--cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=saeedm-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public$(echo .)gmane.org \
--cc=saeedm-VPRAkNaXOzVWk0Htik3J/w@public$(echo .)gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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