On Wed, 2021-02-10 at 22:08 +, Pearson, Robert B wrote:
> Looks perfect. Thanks.
+1
Thanks everyone.
merge of the rdma tree with Linus' tree
On Wed, Feb 10, 2021 at 06:57:24PM +, Pearson, Robert B wrote:
> It looks like f1b0a8ea9f12 ("Revert "RDMA/rxe: Remove VLAN code
> leftovers from RXE"") has not been applied to rdma for-next which is
> where I do my
On Wed, Feb 10, 2021 at 06:57:24PM +, Pearson, Robert B wrote:
> It looks like f1b0a8ea9f12 ("Revert "RDMA/rxe: Remove VLAN code
> leftovers from RXE"") has not been applied to rdma for-next which is
> where I do my work. Not sure how it got upstream.
It was sent to the rc tree, don't worry t
It looks like f1b0a8ea9f12 ("Revert "RDMA/rxe: Remove VLAN code leftovers from
RXE"") has not been applied to rdma for-next which is where I do my work. Not
sure how it got upstream.
bob
-Original Message-
From: Stephen Rothwell
Sent: Tuesday, February 9, 2021 8:16 PM
To: Doug Ledford
On Thu, 2019-06-20 at 12:10 +1000, Stephen Rothwell wrote:
> 2d3c72ed5041 ("rdma: Remove nes")
Yeah, not much you can do about tree wide patchsets conflicting with a
removal ;-)
--
Doug Ledford
GPG KeyID: B826A3330E572FDD
Fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FD
On Thu, 2019-06-20 at 12:06 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> include/rdma/ib_verbs.h
>
> between commit:
>
> dc1435c00fcd ("RDMA/srp: Rename SRP sysfs name after IB device
> rename trigger")
>
> from Linus' tree a
On Fri, 2019-06-14 at 13:00 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got conflicts in:
>
> drivers/infiniband/core/uverbs_cmd.c
> drivers/infiniband/core/uverbs_std_types_cq.c
>
> between commit:
>
> 6876aaedc8a1 ("RDMA/uverbs: Pass udata on u
Hi Stephen,
> -Original Message-
> From: Stephen Rothwell
> Sent: Thursday, September 27, 2018 7:01 PM
> To: Doug Ledford ; Jason Gunthorpe
>
> Cc: Linux-Next Mailing List ; Linux Kernel
> Mailing List ; Parav Pandit
>
> Subject: linux-next: manual merge of the rdma tree with Linus' tre
Hi Jason,
On Mon, 6 Aug 2018 13:41:42 -0600 Jason Gunthorpe wrote:
>
> The resolution should end up like this:
>
> srcu_key = srcu_read_lock(&file->device->disassociate_srcu);
>
> if (!verify_command_mask(file, command, extended)) {
> ret = -EOPNOTSUPP;
>
On Mon, Aug 06, 2018 at 12:01:31PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> drivers/infiniband/core/uverbs_main.c
>
> between commit:
>
> 1eb9364ce81d ("IB/uverbs: Fix ordering of ucontext check in
> ib_uverbs_write")
>
On Fri, Jul 14, 2017 at 10:33:54AM -0400, Doug Ledford wrote:
> So, you need to take your pick. Do you want continuous development, or
> do you want me bending over backwards to try and avoid your company's
> endless stream of conflicts so Linus isn't yelling about that?
Doug,
You are mixing my
On Fri, 2017-07-14 at 07:54 +0300, Leon Romanovsky wrote:
> On Fri, Jul 14, 2017 at 12:12:33AM -0400, Doug Ledford wrote:
> > On Fri, 2017-07-14 at 06:34 +0300, Leon Romanovsky wrote:
> > > On Thu, Jul 13, 2017 at 09:17:13PM -0400, Doug Ledford wrote:
> > > > On Fri, 2017-07-14 at 11:14 +1000, Step
On Fri, Jul 14, 2017 at 08:03:49AM -0400, Doug Ledford wrote:
> On Fri, 2017-07-14 at 07:55 +0300, Leon Romanovsky wrote:
> > On Fri, Jul 14, 2017 at 01:50:26PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > On Fri, 14 Jul 2017 06:34:16 +0300 Leon Romanovsky > > > wrote:
> > > >
> > > >
On Fri, 2017-07-14 at 07:55 +0300, Leon Romanovsky wrote:
> On Fri, Jul 14, 2017 at 01:50:26PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > On Fri, 14 Jul 2017 06:34:16 +0300 Leon Romanovsky > > wrote:
> > >
> > > Sorry Doug, but it is not expected at all for the code which will
> > > go t
On Fri, Jul 14, 2017 at 01:50:26PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Fri, 14 Jul 2017 06:34:16 +0300 Leon Romanovsky wrote:
> >
> > Sorry Doug, but it is not expected at all for the code which will go to
> > 4.14.
> >
> > Both patches in question were targeted for 4.13 and you was e
On Fri, Jul 14, 2017 at 12:12:33AM -0400, Doug Ledford wrote:
> On Fri, 2017-07-14 at 06:34 +0300, Leon Romanovsky wrote:
> > On Thu, Jul 13, 2017 at 09:17:13PM -0400, Doug Ledford wrote:
> > > On Fri, 2017-07-14 at 11:14 +1000, Stephen Rothwell wrote:
> > > > Hi Doug,
> > > >
> > > > Today's linux
On Fri, 2017-07-14 at 06:34 +0300, Leon Romanovsky wrote:
> On Thu, Jul 13, 2017 at 09:17:13PM -0400, Doug Ledford wrote:
> > On Fri, 2017-07-14 at 11:14 +1000, Stephen Rothwell wrote:
> > > Hi Doug,
> > >
> > > Today's linux-next merge of the rdma tree got conflicts in:
> > >
> > > drivers/inf
Hi all,
On Fri, 14 Jul 2017 06:34:16 +0300 Leon Romanovsky wrote:
>
> Sorry Doug, but it is not expected at all for the code which will go to 4.14.
>
> Both patches in question were targeted for 4.13 and you was expected to
> see the merge conflicts during last month or so, prior to merge window
On Thu, Jul 13, 2017 at 09:17:13PM -0400, Doug Ledford wrote:
> On Fri, 2017-07-14 at 11:14 +1000, Stephen Rothwell wrote:
> > Hi Doug,
> >
> > Today's linux-next merge of the rdma tree got conflicts in:
> >
> > drivers/infiniband/core/uverbs_cmd.c
> > drivers/infiniband/core/verbs.c
> >
> > be
On Fri, 2017-07-14 at 11:14 +1000, Stephen Rothwell wrote:
> Hi Doug,
>
> Today's linux-next merge of the rdma tree got conflicts in:
>
> drivers/infiniband/core/uverbs_cmd.c
> drivers/infiniband/core/verbs.c
>
> between commit:
>
> d291f1a65232 ("IB/core: Enforce PKey security on QPs")
>
Hi Doug,
Today's linux-next merge of the rdma tree got a conflict in:
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
between commit:
c91aed989694 ("svcrdma: handle rdma read with a non-zero initial page
offset")
from Linus' tree and commit:
412a15c0fe53 ("svcrdma: Port to new memory regis
21 matches
Mail list logo
