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@xxxxxxxxxxxxx> > > > wrote: > > > > > > > > From: Saeed Mahameed <saeedm@xxxxxxxxxxxx> > > > > 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@xxxxxxxxxx> > GPG KeyID: B826A3330E572FDD > > Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
Attachment:
signature.asc
Description: PGP signature
