Re: [PATCH for-next V1 0/2] mlx5_core: mlx5_ifc updates

[Leon Romanovsky <leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>]

[-- Attachment #1: Type: text/plain, Size: 2101 bytes --]

On Fri, Apr 29, 2016 at 01:56:07PM -0400, Doug Ledford wrote:
> On 04/29/2016 01:07 AM, Leon Romanovsky wrote:
> > On Thu, Apr 28, 2016 at 09:41:37PM -0400, Doug Ledford wrote:
> >> On 04/18/2016 11:12 AM, Leon Romanovsky wrote:
> >>> On Fri, Apr 15, 2016 at 05:22:54PM -0400, David Miller wrote:
> >>>> From: Saeed Mahameed <saeedm-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
> >>>> Date: Fri, 15 Apr 2016 20:10:07 +0300
> >>>>
> >>>>> On Wed, Apr 13, 2016 at 7:11 PM, Saeed Mahameed <saeedm-VPRAkNaXOzXQFizaE/u3fw@public.gmane.orgm> wrote:
> >>>
> >>> Hi Doug,
> >>> Can you please take this patchset in addition to Dave? It will save
> >>> our list from many kbuild errors.
> >>
> >> Dave, did you pull this from Leon's git repo, or apply patches and
> >> generate new, unique commit hashes?
> > 
> > Doug,
> > We sent IFC changes before I had a tree, so Dave took it as separate
> > commits. The coming release submission will be based on my tree.
> 
> The point of my question was that if we both take in patches, we
> generate diffs with different commit hashes, and that technicall
> represents a merge (although if the patches are identical, they should
> auto-merge).  Linus had requested we pull from the same tree so we both
> get the same commit hashes, then no merge conflicts since git will
> recognize the commits as being *exactly* identical.  Right now, the only
> way to accomplish that is for me to pull net-next and base my for-next
> on net-next.

I don't think that is really needed. I recall two reasons for his
request: one was mentioned by you and the second was need to chose
which tree has right order of subsequent commits.

In this merge window, we choose very carefully patch sets and their
common part, so no merge conflict between different trees will occur,
because of Mellanox code.

Whatever you decide to pull or not and something will go wrong,
please put all blame on me.

Thanks.

> 
> 
> -- 
> Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
>               GPG KeyID: 0E572FDD
> 
> 



[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]