linux-rdma.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH rdma-core 0/3] Debian 15.1-1 changes
@ 2017-11-30 12:39 Benjamin Drung
       [not found] ` <20171130123940.25795-1-benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
  0 siblings, 1 reply; 16+ messages in thread
From: Benjamin Drung @ 2017-11-30 12:39 UTC (permalink / raw)
  To: linux-rdma-u79uwXL29TY76Z2rM5mHXA; +Cc: Benjamin Drung

This patch set contains the packaging changes from the Debian unstable 15.1-1
upload.

Benjamin Drung (3):
  debian: Add m68k as non-coherent DMA architecture
  debian: Mark libraries as Multi-Arch: same
  debian: Update changelog to include Debian uploads

 debian/changelog | 31 +++++++++++++++++++++++++++++++
 debian/control   |  6 ++++++
 debian/rules     |  2 +-
 3 files changed, 38 insertions(+), 1 deletion(-)

-- 
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH rdma-core 1/3] debian: Add m68k as non-coherent DMA architecture
       [not found] ` <20171130123940.25795-1-benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
@ 2017-11-30 12:39   ` Benjamin Drung
  2017-11-30 12:39   ` [PATCH rdma-core 2/3] debian: Mark libraries as Multi-Arch: same Benjamin Drung
                     ` (2 subsequent siblings)
  3 siblings, 0 replies; 16+ messages in thread
From: Benjamin Drung @ 2017-11-30 12:39 UTC (permalink / raw)
  To: linux-rdma-u79uwXL29TY76Z2rM5mHXA; +Cc: Benjamin Drung

The architecture m68k does not support coherent DMA. Therefore also
exclude it.

Signed-off-by: Benjamin Drung <benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 030eb6b9..be1781ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-NO_COHERENT_DMA_ARCHS = alpha armel armhf hppa mips mips64el mipsel sh4
+NO_COHERENT_DMA_ARCHS = alpha armel armhf hppa m68k mips mips64el mipsel sh4
 
 %:
 	dh $@ --with systemd --builddirectory=build-deb
-- 
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH rdma-core 2/3] debian: Mark libraries as Multi-Arch: same
       [not found] ` <20171130123940.25795-1-benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
  2017-11-30 12:39   ` [PATCH rdma-core 1/3] debian: Add m68k as non-coherent DMA architecture Benjamin Drung
@ 2017-11-30 12:39   ` Benjamin Drung
  2017-11-30 12:39   ` [PATCH rdma-core 3/3] debian: Update changelog to include Debian uploads Benjamin Drung
  2017-11-30 17:47   ` [PATCH rdma-core 0/3] Debian 15.1-1 changes Jason Gunthorpe
  3 siblings, 0 replies; 16+ messages in thread
From: Benjamin Drung @ 2017-11-30 12:39 UTC (permalink / raw)
  To: linux-rdma-u79uwXL29TY76Z2rM5mHXA; +Cc: Benjamin Drung

The library packages do not contain any maintainer scripts and for any
pair of architectures, the common files have equal content. Thus it
should be safe to mark the package Multi-Arch: same.

Signed-off-by: Benjamin Drung <benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
---
 debian/control | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/control b/debian/control
index cddc9db5..451b379f 100644
--- a/debian/control
+++ b/debian/control
@@ -175,6 +175,7 @@ Description: Debug symbols for the libibverbs library
 Package: libibcm-dev
 Section: libdevel
 Architecture: linux-any
+Multi-Arch: same
 Depends: libibcm1 (= ${binary:Version}), libibverbs-dev, ${misc:Depends}
 Description: Development files for the libibcm library
  libibcm provides a userspace implementation of an InfiniBand
@@ -187,6 +188,7 @@ Description: Development files for the libibcm library
 
 Package: libibcm1
 Architecture: linux-any
+Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: InfiniBand Communication Manager (CM) library
@@ -212,6 +214,7 @@ Description: Debug symbols for the libibcm1 library
 Package: libibumad-dev
 Section: libdevel
 Architecture: linux-any
+Multi-Arch: same
 Depends: libibumad3 (= ${binary:Version}), ${misc:Depends}
 Description: Development files for libibumad
  libibumad provides userspace Infiniband Management Datagram (uMAD)
@@ -224,6 +227,7 @@ Description: Development files for libibumad
 
 Package: libibumad3
 Architecture: linux-any
+Multi-Arch: same
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -250,6 +254,7 @@ Description: Debug symbols for the libibumad3 library
 Package: librdmacm-dev
 Section: libdevel
 Architecture: linux-any
+Multi-Arch: same
 Depends: libibverbs-dev, librdmacm1 (= ${binary:Version}), ${misc:Depends}
 Description: Development files for the librdmacm library
  librdmacm is a library that allows applications to set up reliable
@@ -271,6 +276,7 @@ Description: Development files for the librdmacm library
 
 Package: librdmacm1
 Architecture: linux-any
+Multi-Arch: same
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-- 
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH rdma-core 3/3] debian: Update changelog to include Debian uploads
       [not found] ` <20171130123940.25795-1-benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
  2017-11-30 12:39   ` [PATCH rdma-core 1/3] debian: Add m68k as non-coherent DMA architecture Benjamin Drung
  2017-11-30 12:39   ` [PATCH rdma-core 2/3] debian: Mark libraries as Multi-Arch: same Benjamin Drung
@ 2017-11-30 12:39   ` Benjamin Drung
  2017-11-30 17:47   ` [PATCH rdma-core 0/3] Debian 15.1-1 changes Jason Gunthorpe
  3 siblings, 0 replies; 16+ messages in thread
From: Benjamin Drung @ 2017-11-30 12:39 UTC (permalink / raw)
  To: linux-rdma-u79uwXL29TY76Z2rM5mHXA; +Cc: Benjamin Drung

rdma-core 15-2, 15-3, and 15.1-1 were uploaded to Debian unstable.
Include the changelogs from these uploads.

Signed-off-by: Benjamin Drung <benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
---
 debian/changelog | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 44a83eaa..3336f331 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,37 @@ rdma-core (16.0-1) unstable; urgency=low
 
  -- Jason Gunthorpe <jgg-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>  Tue, 14 Nov 2017 12:24:09 +0100
 
+rdma-core (15.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add m68k as non-coherent DMA architecture
+  * Mark libraries as Multi-Arch: same
+
+ -- Benjamin Drung <benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>  Thu, 30 Nov 2017 12:08:26 +0100
+
+rdma-core (15-3) unstable; urgency=medium
+
+  * debian/rules: Include architecture.mk for DEB_HOST_ARCH definition
+  * Add alpha, hppa, sh4 as non-coherent DMA archs
+  * Do not require valgrind on x32 (not available there due to build failure)
+
+ -- Benjamin Drung <benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>  Thu, 16 Nov 2017 17:33:48 +0100
+
+rdma-core (15-2) unstable; urgency=medium
+
+  * Do not build ibacm for non-Linux architectures
+  * Do not require valgrind if not available
+  * Let libibverbs1 15 break ibverbs-providers 14
+  * Drop dh-systemd build dependency
+  * Bump Standards-Version to 4.1.1 (no changes needed)
+  * Drop lintian overrides for false positives
+  * Set myself as maintainer (instead of linux-rdma)
+  * Do not try to install disabled ibverbs providers on architectures that do
+    not provide cache coherent DMA (Closes: #881731)
+  * Explicitly list private libibverbs symbols
+
+ -- Benjamin Drung <benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>  Thu, 16 Nov 2017 12:55:28 +0100
+
 rdma-core (15-1) unstable; urgency=medium
 
   * New upstream version. ibverbs-providers combines the source packages
-- 
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [PATCH rdma-core 0/3] Debian 15.1-1 changes
       [not found] ` <20171130123940.25795-1-benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
                     ` (2 preceding siblings ...)
  2017-11-30 12:39   ` [PATCH rdma-core 3/3] debian: Update changelog to include Debian uploads Benjamin Drung
@ 2017-11-30 17:47   ` Jason Gunthorpe
       [not found]     ` <20171130174750.GD7754-uk2M96/98Pc@public.gmane.org>
  3 siblings, 1 reply; 16+ messages in thread
From: Jason Gunthorpe @ 2017-11-30 17:47 UTC (permalink / raw)
  To: Benjamin Drung; +Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA

On Thu, Nov 30, 2017 at 01:39:37PM +0100, Benjamin Drung wrote:

>   debian: Add m68k as non-coherent DMA architecture
>   debian: Mark libraries as Multi-Arch: same

As Leon says, shouldn't these go on the mainline branch also?

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH rdma-core 0/3] Debian 15.1-1 changes
       [not found]     ` <20171130174750.GD7754-uk2M96/98Pc@public.gmane.org>
@ 2017-11-30 18:21       ` Benjamin Drung
       [not found]         ` <1512066118.4246.2.camel-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
  0 siblings, 1 reply; 16+ messages in thread
From: Benjamin Drung @ 2017-11-30 18:21 UTC (permalink / raw)
  To: Jason Gunthorpe; +Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA

Am Donnerstag, den 30.11.2017, 10:47 -0700 schrieb Jason Gunthorpe:
> On Thu, Nov 30, 2017 at 01:39:37PM +0100, Benjamin Drung wrote:
> 
> >   debian: Add m68k as non-coherent DMA architecture
> >   debian: Mark libraries as Multi-Arch: same
> 
> As Leon says, shouldn't these go on the mainline branch also?

The complete patch set targets the master branch.

--
Benjamin Drung
System Developer
Debian & Ubuntu Developer

ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin

Email: benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org
URL: https://www.profitbricks.de

Sitz der Gesellschaft: Berlin
Registergericht: Amtsgericht Charlottenburg, HRB 125506 B
Geschäftsführer: Achim Weiss, Matthias Steinberg
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH rdma-core 0/3] Debian 15.1-1 changes
       [not found]         ` <1512066118.4246.2.camel-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
@ 2017-11-30 18:58           ` Jason Gunthorpe
       [not found]             ` <20171130185822.GE7754-uk2M96/98Pc@public.gmane.org>
  0 siblings, 1 reply; 16+ messages in thread
From: Jason Gunthorpe @ 2017-11-30 18:58 UTC (permalink / raw)
  To: Benjamin Drung; +Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA

On Thu, Nov 30, 2017 at 07:21:58PM +0100, Benjamin Drung wrote:
> Am Donnerstag, den 30.11.2017, 10:47 -0700 schrieb Jason Gunthorpe:
> > On Thu, Nov 30, 2017 at 01:39:37PM +0100, Benjamin Drung wrote:
> > 
> > >   debian: Add m68k as non-coherent DMA architecture
> > >   debian: Mark libraries as Multi-Arch: same
> > 
> > As Leon says, shouldn't these go on the mainline branch also?
> 
> The complete patch set targets the master branch.

Oh, I see how you working this, I saw them already applied to the
debian branch and didn't quite get it :)

Looks fine to me

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH rdma-core 0/3] Debian 15.1-1 changes
       [not found]             ` <20171130185822.GE7754-uk2M96/98Pc@public.gmane.org>
@ 2017-11-30 22:09               ` Benjamin Drung
       [not found]                 ` <1512079788.3878.1.camel-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
  0 siblings, 1 reply; 16+ messages in thread
From: Benjamin Drung @ 2017-11-30 22:09 UTC (permalink / raw)
  To: Jason Gunthorpe; +Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA

Am Donnerstag, den 30.11.2017, 11:58 -0700 schrieb Jason Gunthorpe:
> On Thu, Nov 30, 2017 at 07:21:58PM +0100, Benjamin Drung wrote:
> > Am Donnerstag, den 30.11.2017, 10:47 -0700 schrieb Jason Gunthorpe:
> > > On Thu, Nov 30, 2017 at 01:39:37PM +0100, Benjamin Drung wrote:
> > > 
> > > >   debian: Add m68k as non-coherent DMA architecture
> > > >   debian: Mark libraries as Multi-Arch: same
> > > 
> > > As Leon says, shouldn't these go on the mainline branch also?
> > 
> > The complete patch set targets the master branch.
> 
> Oh, I see how you working this, I saw them already applied to the
> debian branch and didn't quite get it :)
> 
> Looks fine to me

Since you approved these change, may I do the rebase and merge to master
or is that task restricted to certain people or workflows?

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin

Email: benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org
URL:  http://www.profitbricks.com

Sitz der Gesellschaft: Berlin.
Registergericht: Amtsgericht Charlottenburg, HRB 125506B.
Geschäftsführer: Andreas Gauger, Achim Weiss.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH rdma-core 0/3] Debian 15.1-1 changes
       [not found]                 ` <1512079788.3878.1.camel-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
@ 2017-12-01  5:57                   ` Leon Romanovsky
       [not found]                     ` <20171201055732.GC8126-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
  0 siblings, 1 reply; 16+ messages in thread
From: Leon Romanovsky @ 2017-12-01  5:57 UTC (permalink / raw)
  To: Benjamin Drung; +Cc: Jason Gunthorpe, linux-rdma-u79uwXL29TY76Z2rM5mHXA

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

On Thu, Nov 30, 2017 at 11:09:48PM +0100, Benjamin Drung wrote:
> Am Donnerstag, den 30.11.2017, 11:58 -0700 schrieb Jason Gunthorpe:
> > On Thu, Nov 30, 2017 at 07:21:58PM +0100, Benjamin Drung wrote:
> > > Am Donnerstag, den 30.11.2017, 10:47 -0700 schrieb Jason Gunthorpe:
> > > > On Thu, Nov 30, 2017 at 01:39:37PM +0100, Benjamin Drung wrote:
> > > >
> > > > >   debian: Add m68k as non-coherent DMA architecture
> > > > >   debian: Mark libraries as Multi-Arch: same
> > > >
> > > > As Leon says, shouldn't these go on the mainline branch also?
> > >
> > > The complete patch set targets the master branch.
> >
> > Oh, I see how you working this, I saw them already applied to the
> > debian branch and didn't quite get it :)
> >
> > Looks fine to me
>
> Since you approved these change, may I do the rebase and merge to master
> or is that task restricted to certain people or workflows?

debian/* is yours, feel free to merge it.

Thanks

>
> --
> Benjamin Drung
> System Developer
> Debian & Ubuntu Developer
>
> ProfitBricks GmbH
> Greifswalder Str. 207
> D - 10405 Berlin
>
> Email: benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org
> URL:  http://www.profitbricks.com
>
> Sitz der Gesellschaft: Berlin.
> Registergericht: Amtsgericht Charlottenburg, HRB 125506B.
> Geschäftsführer: Andreas Gauger, Achim Weiss.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH rdma-core 0/3] Debian 15.1-1 changes
       [not found]                     ` <20171201055732.GC8126-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
@ 2017-12-01 18:13                       ` Benjamin Drung
       [not found]                         ` <1512151985.9183.4.camel-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
  0 siblings, 1 reply; 16+ messages in thread
From: Benjamin Drung @ 2017-12-01 18:13 UTC (permalink / raw)
  To: Leon Romanovsky; +Cc: Jason Gunthorpe, linux-rdma-u79uwXL29TY76Z2rM5mHXA

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

Am Freitag, den 01.12.2017, 07:57 +0200 schrieb Leon Romanovsky:
> On Thu, Nov 30, 2017 at 11:09:48PM +0100, Benjamin Drung wrote:
> > Am Donnerstag, den 30.11.2017, 11:58 -0700 schrieb Jason Gunthorpe:
> > > On Thu, Nov 30, 2017 at 07:21:58PM +0100, Benjamin Drung wrote:
> > > > Am Donnerstag, den 30.11.2017, 10:47 -0700 schrieb Jason
> > > > Gunthorpe:
> > > > > On Thu, Nov 30, 2017 at 01:39:37PM +0100, Benjamin Drung
> > > > > wrote:
> > > > > 
> > > > > >   debian: Add m68k as non-coherent DMA architecture
> > > > > >   debian: Mark libraries as Multi-Arch: same
> > > > > 
> > > > > As Leon says, shouldn't these go on the mainline branch also?
> > > > 
> > > > The complete patch set targets the master branch.
> > > 
> > > Oh, I see how you working this, I saw them already applied to the
> > > debian branch and didn't quite get it :)
> > > 
> > > Looks fine to me
> > 
> > Since you approved these change, may I do the rebase and merge to
> > master
> > or is that task restricted to certain people or workflows?
> 
> debian/* is yours, feel free to merge it.

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.

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin

Email: benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org
URL: https://www.profitbricks.de

Sitz der Gesellschaft: Berlin
Registergericht: Amtsgericht Charlottenburg, HRB 125506 B
Geschäftsführer: Achim Weiss, Matthias Steinberg

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH rdma-core 0/3] Debian 15.1-1 changes
       [not found]                         ` <1512151985.9183.4.camel-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
@ 2017-12-01 18:28                           ` Jason Gunthorpe
       [not found]                             ` <20171201182806.GL7754-uk2M96/98Pc@public.gmane.org>
  0 siblings, 1 reply; 16+ messages in thread
From: Jason Gunthorpe @ 2017-12-01 18:28 UTC (permalink / raw)
  To: Benjamin Drung; +Cc: Leon Romanovsky, linux-rdma-u79uwXL29TY76Z2rM5mHXA

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.

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH rdma-core 0/3] Debian 15.1-1 changes
       [not found]                             ` <20171201182806.GL7754-uk2M96/98Pc@public.gmane.org>
@ 2017-12-02  8:40                               ` Leon Romanovsky
       [not found]                                 ` <20171202084019.GG8126-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
  0 siblings, 1 reply; 16+ messages in thread
From: Leon Romanovsky @ 2017-12-02  8:40 UTC (permalink / raw)
  To: Jason Gunthorpe; +Cc: Benjamin Drung, linux-rdma-u79uwXL29TY76Z2rM5mHXA

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

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.

>
> Jason

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH rdma-core 0/3] Debian 15.1-1 changes
       [not found]                                 ` <20171202084019.GG8126-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
@ 2017-12-02 16:28                                   ` Jason Gunthorpe
       [not found]                                     ` <20171202162856.GA28143-uk2M96/98Pc@public.gmane.org>
  0 siblings, 1 reply; 16+ messages in thread
From: Jason Gunthorpe @ 2017-12-02 16:28 UTC (permalink / raw)
  To: Leon Romanovsky; +Cc: Benjamin Drung, linux-rdma-u79uwXL29TY76Z2rM5mHXA

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? I wish github did that :( 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-9UaJU3cA/F/QT0dZR+AlfA@public.gmane.org>"
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-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
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
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH rdma-core 0/3] Debian 15.1-1 changes
       [not found]                                     ` <20171202162856.GA28143-uk2M96/98Pc@public.gmane.org>
@ 2017-12-03  6:55                                       ` Leon Romanovsky
       [not found]                                         ` <20171203065501.GA2110-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
  0 siblings, 1 reply; 16+ messages in thread
From: Leon Romanovsky @ 2017-12-03  6:55 UTC (permalink / raw)
  To: Jason Gunthorpe; +Cc: Benjamin Drung, linux-rdma-u79uwXL29TY76Z2rM5mHXA

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

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-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
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-9UaJU3cA/F/QT0dZR+AlfA@public.gmane.org>"
> 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-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> 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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH rdma-core 0/3] Debian 15.1-1 changes
       [not found]                                         ` <20171203065501.GA2110-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
@ 2017-12-03 16:27                                           ` Jason Gunthorpe
       [not found]                                             ` <20171203162704.GA8566-uk2M96/98Pc@public.gmane.org>
  0 siblings, 1 reply; 16+ messages in thread
From: Jason Gunthorpe @ 2017-12-03 16:27 UTC (permalink / raw)
  To: Leon Romanovsky; +Cc: Benjamin Drung, linux-rdma-u79uwXL29TY76Z2rM5mHXA

On Sun, Dec 03, 2017 at 08:55:01AM +0200, Leon Romanovsky wrote:
> > Are we?
> 
> Rarely,
> 
> Merge: cea6f4e0 e0ed9229
> Author: Leon Romanovsky <leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> 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.

How do you do that? I always write a letter in the PR?

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH rdma-core 0/3] Debian 15.1-1 changes
       [not found]                                             ` <20171203162704.GA8566-uk2M96/98Pc@public.gmane.org>
@ 2017-12-04  4:33                                               ` Leon Romanovsky
  0 siblings, 0 replies; 16+ messages in thread
From: Leon Romanovsky @ 2017-12-04  4:33 UTC (permalink / raw)
  To: Jason Gunthorpe; +Cc: Benjamin Drung, linux-rdma-u79uwXL29TY76Z2rM5mHXA

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

On Sun, Dec 03, 2017 at 09:27:04AM -0700, Jason Gunthorpe wrote:
> On Sun, Dec 03, 2017 at 08:55:01AM +0200, Leon Romanovsky wrote:
> > > Are we?
> >
> > Rarely,
> >
> > Merge: cea6f4e0 e0ed9229
> > Author: Leon Romanovsky <leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> > 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.
>
> How do you do that? I always write a letter in the PR?

At the merge stage, there is an edit box, the content of that box will
be put in the merge commit.

As the latest example, see commit bf2450ea "Merge pull request #265 from yishaih/mlx5_tunnel"

Thanks

>
> Jason

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2017-12-04  4:33 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-30 12:39 [PATCH rdma-core 0/3] Debian 15.1-1 changes Benjamin Drung
     [not found] ` <20171130123940.25795-1-benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2017-11-30 12:39   ` [PATCH rdma-core 1/3] debian: Add m68k as non-coherent DMA architecture Benjamin Drung
2017-11-30 12:39   ` [PATCH rdma-core 2/3] debian: Mark libraries as Multi-Arch: same Benjamin Drung
2017-11-30 12:39   ` [PATCH rdma-core 3/3] debian: Update changelog to include Debian uploads Benjamin Drung
2017-11-30 17:47   ` [PATCH rdma-core 0/3] Debian 15.1-1 changes Jason Gunthorpe
     [not found]     ` <20171130174750.GD7754-uk2M96/98Pc@public.gmane.org>
2017-11-30 18:21       ` Benjamin Drung
     [not found]         ` <1512066118.4246.2.camel-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2017-11-30 18:58           ` Jason Gunthorpe
     [not found]             ` <20171130185822.GE7754-uk2M96/98Pc@public.gmane.org>
2017-11-30 22:09               ` Benjamin Drung
     [not found]                 ` <1512079788.3878.1.camel-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2017-12-01  5:57                   ` Leon Romanovsky
     [not found]                     ` <20171201055732.GC8126-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
2017-12-01 18:13                       ` Benjamin Drung
     [not found]                         ` <1512151985.9183.4.camel-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2017-12-01 18:28                           ` Jason Gunthorpe
     [not found]                             ` <20171201182806.GL7754-uk2M96/98Pc@public.gmane.org>
2017-12-02  8:40                               ` Leon Romanovsky
     [not found]                                 ` <20171202084019.GG8126-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
2017-12-02 16:28                                   ` Jason Gunthorpe
     [not found]                                     ` <20171202162856.GA28143-uk2M96/98Pc@public.gmane.org>
2017-12-03  6:55                                       ` Leon Romanovsky
     [not found]                                         ` <20171203065501.GA2110-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
2017-12-03 16:27                                           ` Jason Gunthorpe
     [not found]                                             ` <20171203162704.GA8566-uk2M96/98Pc@public.gmane.org>
2017-12-04  4:33                                               ` Leon Romanovsky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).