From: Leon Romanovsky <leon@kernel.org>
To: Doug Ledford <dledford@redhat.com>
Cc: David Miller <davem@davemloft.net>,
linux-rdma@vger.kernel.org, netdev@vger.kernel.org,
matanb@mellanox.com, saeedm@mellanox.com
Subject: Re: [GIT PULL] Please Pull Mellanox Shared Code
Date: Tue, 14 Jun 2016 20:51:33 +0300 [thread overview]
Message-ID: <20160614175133.GQ5408@leon.nu> (raw)
In-Reply-To: <e88d3000-f137-181e-4ea2-cd33101dd57c@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 2372 bytes --]
On Tue, Jun 14, 2016 at 01:16:50PM -0400, Doug Ledford wrote:
> On 6/14/2016 3:02 AM, David Miller wrote:
> >
> > Please, just stop right now.
> >
> > We're not asking for the a huge patch covering the entire pull
> > request.
> >
> > We're asking for you to post a patch series, one per commit, and as
> > numbered, fresh, new mailing list patch postings. As if you were
> > submitting these changes for the very first time to the list.
> >
> > Please ask a colleague for how to do this properly before you spam the
> > list again with more unnecessary and improperly formatted submissions.
>
> Dave,
>
> He's doing what Linus requested from Mellanox. They were instructed to
> identify all of the coming changes in the next release where patches
> sent through your tree and patches sent through my tree would have
> conflicts. They were then instructed to make git commits that merged
> those changes and have both you and I pull them (please note "pull", not
> git am patches) so that we have the exact same commit hashes in our
> trees and git will do the right thing when your tree and my tree are
> merged in the next merge window. As it turns out the conflicts are
> mainly in this firmware offset definition file. They just put all of
> the needed changes in there in one commit. I doubt they have individual
> patches here. This was a custom made patch who's sole purpose is to
> combine all the otherwise possibly conflicting changes in one place.
> I'm sure they could split it out into different commits, but they
> wouldn't be full commits, just the portion that applies to this firmware
> file.
Thanks Doug,
In addition to your accurate description. We don't have separate commits
for this file (mlx5_ifc.h) for many reasons: auto generated file, one
logical change (enable FW features), no helpful for bisect e.t.c.
My goal was to simplify the maintainers' work by sending minimal
possible pull request with easy for review information.
I also resent the pull request [1] as a cover letter together with patch itself [2].
[1] http://lkml.kernel.org/r/1465900500-1578-1-git-send-email-leonro+()+mellanox+!+com
[2] http://lkml.kernel.org/r/1465900500-1578-2-git-send-email-leonro+()+mellanox+!+com
Thanks.
>
> --
> Doug Ledford <dledford@redhat.com>
> GPG Key ID: 0E572FDD
>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2016-06-14 17:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-13 12:03 [GIT PULL] Please Pull Mellanox Shared Code Leon Romanovsky
2016-06-13 13:49 ` Or Gerlitz
2016-06-14 6:12 ` David Miller
[not found] ` <20160614.021249.1038979871508877232.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2016-06-14 6:32 ` Leon Romanovsky
2016-06-14 6:35 ` Leon Romanovsky
2016-06-14 7:02 ` David Miller
[not found] ` <20160614.030229.1431969399873476358.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2016-06-14 17:16 ` Doug Ledford
2016-06-14 17:34 ` Or Gerlitz
2016-06-14 17:51 ` Leon Romanovsky [this message]
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=20160614175133.GQ5408@leon.nu \
--to=leon@kernel.org \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=linux-rdma@vger.kernel.org \
--cc=matanb@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
/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