On Sat, Dec 02, 2017 at 09:28:56AM -0700, Jason Gunthorpe wrote:
> On Sat, Dec 02, 2017 at 10:40:19AM +0200, Leon Romanovsky wrote:
> > On Fri, Dec 01, 2017 at 11:28:06AM -0700, Jason Gunthorpe wrote:
> > > On Fri, Dec 01, 2017 at 07:13:05PM +0100, Benjamin Drung wrote:
> > > > GitHub does not allow to rebase & merge the pull request. Is there any
> > > > reason to not allow the rebase & merge workflow? My commits are atomic
> > > > and the git history is cleaner without the merge commits.
> > >
> > > We have been using the merge workflow. I'm not sure this was every
> > > really discussed which is best or not.
> > >
> > > The git history is simpler with rebase, but merge preserves the 'what
> > > did I test' and preserves the series boundaries, which are also useful things.
> >
> > We are also putting cover letters into the merge commit for documentation
> > purposes.
>
> Are we?
Rarely,
Merge: cea6f4e0 e0ed9229
Author: Leon Romanovsky <leon@xxxxxxxxxx>
Date: Thu Sep 28 16:58:57 2017 +0300
Merge branch 'jgunthorpe-new-init'
* jgunthorpe-new-init:
rxe: Use VERBS_NAME_MATCH to match the rxe device
hns: Use the generic modalias matcher
cxgb: Use the new common PCI matching infrastructure
providers: Use the new common PCI matching infrastructure
verbs: Provide common code to match providers against kernel devices
verbs: Remove the init_device entry point
providers: Use the new match_device and allocate_device ops
verbs: Split init_device into a match and alloc/bind step
cxgb4: Move sysconf up to driver_init
verbs: Change verbs_register_driver to accept the ops struct directly
> I wish github did that :(
Github is doing it, it will help if PR authors place cover letter in
their PR.
> On the plus side it does sign all
> merge commits made through the web interface
>
> commit 4925a85fc53f8f037a6792df450891340ee5a76b
> gpg: Signature made Mon 20 Nov 2017 01:34:16 AM MST using RSA key ID 3AFDEB23
> gpg: Good signature from "GitHub (web-flow commit signing) <noreply@xxxxxxxxxx>"
> gpg: WARNING: This key is not certified with a trusted signature!
> gpg: There is no indication that the signature belongs to the owner.
> Primary key fingerprint: 5DE3 E050 9C47 EA3C F04A 42D3 4AEE 18F8 3AFD EB23
> Merge: 3d9b214443effe 9db80df802bf91
> Author: Leon Romanovsky <leon@xxxxxxxxxx>
> Date: Mon Nov 20 10:34:16 2017 +0200
>
> Merge pull request #254 from jgunthorpe/rdma_cm_mc
>
> Support for the MC join flag in RDMA CM
>
>
> Jason
Attachment:
signature.asc
Description: PGP signature
