* Re: 【Ask for upstream branch】
[not found] ` <33078683-cf77-a116-4245-f561a29b114d-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
@ 2017-08-21 12:57 ` Doug Ledford
[not found] ` <546382b6-7cdc-9277-c0b8-130d58136a88-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Doug Ledford @ 2017-08-21 12:57 UTC (permalink / raw)
To: oulijun, linux-rdma; +Cc: huwei, Chenxin (Charles), weihaifeng, liudongdong
[-- Attachment #1.1: Type: text/plain, Size: 541 bytes --]
On 8/21/2017 2:16 AM, oulijun wrote:
> Hi, Doug Ledford
>
> We are preparing the hip08 RoCE driver for upstreaming. I am found that
>
> you have create a new branch named net-next-base and this branch has
> included
>
> hns3 patchset. If we generate patchset of hip08 RoCE driver, can
> directly based
>
> on this branch?
Yes.
--
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
GPG Key ID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: 【Ask for upstream branch】
[not found] ` <546382b6-7cdc-9277-c0b8-130d58136a88-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
@ 2017-08-24 7:35 ` Wei Hu (Xavier)
[not found] ` <599E81AF.5040901-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Wei Hu (Xavier) @ 2017-08-24 7:35 UTC (permalink / raw)
To: Doug Ledford, oulijun, linux-rdma
Cc: Chenxin (Charles), weihaifeng, liudongdong
On 2017/8/21 20:57, Doug Ledford wrote:
> On 8/21/2017 2:16 AM, oulijun wrote:
>> Hi, Doug Ledford
>>
>> We are preparing the hip08 RoCE driver for upstreaming. I am found that
>>
>> you have create a new branch named net-next-base and this branch has
>> included
>>
>> hns3 patchset. If we generate patchset of hip08 RoCE driver, can
>> directly based
>>
>> on this branch?
> Yes.
>
Hi, Doug
In the repo
https://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git,
we found for-next-merged branch looks newer than k.o/net-next-base,
right ?
please reconfirm which branch we should generate patcheset based on.
Thank you very much!
1. k.o/for-next-merged branch
git log --oneline drivers/infiniband/hw/hns/
b0e32e2 Merge branch 'k.o/for-4.13-rc' into k.o/for-next
5b59a39 IB/hns: fix memory leak on ah on error return path
3e5f088 IB/hns: Avoid compile test under non 64bit environments
8ccf098 Revert "RDMA/hns: fix build regression"
5db465f IB/hns: checking for IS_ERR() instead of NULL
967de35 IB/hns: include linux/interrupt.h
ecd840f RDMA/hns: fix build regression
d1d7149 IB/hns: fix semicolon.cocci warnings
87809f8 IB/hns: fix returnvar.cocci warnings
3756c7f IB/hns: fix boolreturn.cocci warnings
e89bf46 IB/hns: Support compile test for hns RoCE driver
5f110ac4 IB/hns: Fix for checkpatch.pl comment style warnings
d322f00 IB/hns: Fix the bug with modifying the MAC address without
removing the driver
9de61d3 IB/hns: Fix the bug with rdma operation
58c4f0d IB/hns: Fix the bug with wild pointer when destroy rc qp
2. k.o/net-next-base
git log --oneline drivers/infiniband/hw/hns/
5db465f IB/hns: checking for IS_ERR() instead of NULL
5f110ac4 IB/hns: Fix for checkpatch.pl comment style warnings
d322f00 IB/hns: Fix the bug with modifying the MAC address without
removing the driver
9de61d3 IB/hns: Fix the bug with rdma operation
58c4f0d IB/hns: Fix the bug with wild pointer when destroy rc qp
Regards
Wei Hu
--
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] 5+ messages in thread
* Re: 【Ask for upstream branch】
[not found] ` <599E81AF.5040901-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
@ 2017-08-24 8:34 ` oulijun
[not found] ` <a6ed9854-46f0-77be-a708-de7b2100a58c-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: oulijun @ 2017-08-24 8:34 UTC (permalink / raw)
To: Wei Hu (Xavier), Doug Ledford, linux-rdma
Cc: Chenxin (Charles), weihaifeng, liudongdong
在 2017/8/24 15:35, Wei Hu (Xavier) 写道:
>
>
> On 2017/8/21 20:57, Doug Ledford wrote:
>> On 8/21/2017 2:16 AM, oulijun wrote:
>>> Hi, Doug Ledford
>>>
>>> We are preparing the hip08 RoCE driver for upstreaming. I am found that
>>>
>>> you have create a new branch named net-next-base and this branch has
>>> included
>>>
>>> hns3 patchset. If we generate patchset of hip08 RoCE driver, can
>>> directly based
>>>
>>> on this branch?
>> Yes.
>>
> Hi, Doug
>
> In the repo https://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git,
> we found for-next-merged branch looks newer than k.o/net-next-base, right ?
> please reconfirm which branch we should generate patcheset based on.
> Thank you very much!
>
>
> 1. k.o/for-next-merged branch
>
> git log --oneline drivers/infiniband/hw/hns/
>
> b0e32e2 Merge branch 'k.o/for-4.13-rc' into k.o/for-next
> 5b59a39 IB/hns: fix memory leak on ah on error return path
> 3e5f088 IB/hns: Avoid compile test under non 64bit environments
> 8ccf098 Revert "RDMA/hns: fix build regression"
> 5db465f IB/hns: checking for IS_ERR() instead of NULL
> 967de35 IB/hns: include linux/interrupt.h
> ecd840f RDMA/hns: fix build regression
> d1d7149 IB/hns: fix semicolon.cocci warnings
> 87809f8 IB/hns: fix returnvar.cocci warnings
> 3756c7f IB/hns: fix boolreturn.cocci warnings
> e89bf46 IB/hns: Support compile test for hns RoCE driver
> 5f110ac4 IB/hns: Fix for checkpatch.pl comment style warnings
> d322f00 IB/hns: Fix the bug with modifying the MAC address without removing the driver
> 9de61d3 IB/hns: Fix the bug with rdma operation
> 58c4f0d IB/hns: Fix the bug with wild pointer when destroy rc qp
>
> 2. k.o/net-next-base
>
> git log --oneline drivers/infiniband/hw/hns/
>
> 5db465f IB/hns: checking for IS_ERR() instead of NULL
> 5f110ac4 IB/hns: Fix for checkpatch.pl comment style warnings
> d322f00 IB/hns: Fix the bug with modifying the MAC address without removing the driver
> 9de61d3 IB/hns: Fix the bug with rdma operation
> 58c4f0d IB/hns: Fix the bug with wild pointer when destroy rc qp
>
>
> Regards
> Wei Hu
>
Please use net-next-base. Doug have comfirm. Please refer to his reply for this email.
>
>
> .
>
--
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] 5+ messages in thread
* Re: 【Ask for upstream branch】
[not found] ` <a6ed9854-46f0-77be-a708-de7b2100a58c-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
@ 2017-08-24 19:31 ` Doug Ledford
[not found] ` <1503603071.78641.35.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Doug Ledford @ 2017-08-24 19:31 UTC (permalink / raw)
To: oulijun, Wei Hu (Xavier), linux-rdma
Cc: Chenxin (Charles), weihaifeng, liudongdong
On Thu, 2017-08-24 at 16:34 +0800, oulijun wrote:
> 在 2017/8/24 15:35, Wei Hu (Xavier) 写道:
> >
> >
> > On 2017/8/21 20:57, Doug Ledford wrote:
> > > On 8/21/2017 2:16 AM, oulijun wrote:
> > > > Hi, Doug Ledford
> > > >
> > > > We are preparing the hip08 RoCE driver for upstreaming. I
> > > > am found that
> > > >
> > > > you have create a new branch named net-next-base and this
> > > > branch has
> > > > included
> > > >
> > > > hns3 patchset. If we generate patchset of hip08 RoCE driver,
> > > > can
> > > > directly based
> > > >
> > > > on this branch?
> > >
> > > Yes.
> > >
> >
> > Hi, Doug
> >
> > In the repo https://git.kernel.org/pub/scm/linux/kernel/git/dled
> > ford/rdma.git,
> > we found for-next-merged branch looks newer than k.o/net-next-
> > base, right ?
> > please reconfirm which branch we should generate patcheset based
> > on.
> > Thank you very much!
> >
> >
> > 1. k.o/for-next-merged branch
> >
> > git log --oneline drivers/infiniband/hw/hns/
> >
> > b0e32e2 Merge branch 'k.o/for-4.13-rc' into k.o/for-next
> > 5b59a39 IB/hns: fix memory leak on ah on error return path
> > 3e5f088 IB/hns: Avoid compile test under non 64bit environments
> > 8ccf098 Revert "RDMA/hns: fix build regression"
> > 5db465f IB/hns: checking for IS_ERR() instead of NULL
> > 967de35 IB/hns: include linux/interrupt.h
> > ecd840f RDMA/hns: fix build regression
> > d1d7149 IB/hns: fix semicolon.cocci warnings
> > 87809f8 IB/hns: fix returnvar.cocci warnings
> > 3756c7f IB/hns: fix boolreturn.cocci warnings
> > e89bf46 IB/hns: Support compile test for hns RoCE driver
> > 5f110ac4 IB/hns: Fix for checkpatch.pl comment style warnings
> > d322f00 IB/hns: Fix the bug with modifying the MAC address without
> > removing the driver
> > 9de61d3 IB/hns: Fix the bug with rdma operation
> > 58c4f0d IB/hns: Fix the bug with wild pointer when destroy rc qp
> >
> > 2. k.o/net-next-base
> >
> > git log --oneline drivers/infiniband/hw/hns/
> >
> > 5db465f IB/hns: checking for IS_ERR() instead of NULL
> > 5f110ac4 IB/hns: Fix for checkpatch.pl comment style warnings
> > d322f00 IB/hns: Fix the bug with modifying the MAC address without
> > removing the driver
> > 9de61d3 IB/hns: Fix the bug with rdma operation
> > 58c4f0d IB/hns: Fix the bug with wild pointer when destroy rc qp
> >
> >
> > Regards
> > Wei Hu
> >
>
> Please use net-next-base. Doug have comfirm. Please refer to his
> reply for this email.
The net-next-based branch is not intended to go to the next kernel
merge window, it's destined for the merge window after that. If you
don't need anything in net-next-based, then use for-next instead.
That's what will actually be going to Linus.
As for what's newer, the for-next-merged branch is everything merged
together (for-4.13-rc, for-next, and net-next-based), and I really only
have it there for one reason: so I can put the for-next tag on it and
Stephen Rothwell can then pull it into his for-next kernel testing. I
put stuff in there (the net-next-based branch) that isn't going into
the next merge window so that it gets early for-next testing, but that
doesn't mean it is actually going into for-next.
So, like I said, use the for-next branch unless you absolutely depend
on code in the net-next-based branch, and if you do, it means the
submission will flow through into the second merge window instead of
the next merge window.
--
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
--
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] 5+ messages in thread
* Re: 【Ask for upstream branch】
[not found] ` <1503603071.78641.35.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
@ 2017-08-29 1:01 ` Wei Hu (Xavier)
0 siblings, 0 replies; 5+ messages in thread
From: Wei Hu (Xavier) @ 2017-08-29 1:01 UTC (permalink / raw)
To: Doug Ledford, oulijun, linux-rdma
Cc: Chenxin (Charles), weihaifeng, liudongdong
On 2017/8/25 3:31, Doug Ledford wrote:
> On Thu, 2017-08-24 at 16:34 +0800, oulijun wrote:
>> 在 2017/8/24 15:35, Wei Hu (Xavier) 写道:
>>>
>>> On 2017/8/21 20:57, Doug Ledford wrote:
>>>> On 8/21/2017 2:16 AM, oulijun wrote:
>>>>> Hi, Doug Ledford
>>>>>
>>>>> We are preparing the hip08 RoCE driver for upstreaming. I
>>>>> am found that
>>>>>
>>>>> you have create a new branch named net-next-base and this
>>>>> branch has
>>>>> included
>>>>>
>>>>> hns3 patchset. If we generate patchset of hip08 RoCE driver,
>>>>> can
>>>>> directly based
>>>>>
>>>>> on this branch?
>>>> Yes.
>>>>
>>> Hi, Doug
>>>
>>> In the repo https://git.kernel.org/pub/scm/linux/kernel/git/dled
>>> ford/rdma.git,
>>> we found for-next-merged branch looks newer than k.o/net-next-
>>> base, right ?
>>> please reconfirm which branch we should generate patcheset based
>>> on.
>>> Thank you very much!
>>>
>>>
>>> 1. k.o/for-next-merged branch
>>>
>>> git log --oneline drivers/infiniband/hw/hns/
>>>
>>> b0e32e2 Merge branch 'k.o/for-4.13-rc' into k.o/for-next
>>> 5b59a39 IB/hns: fix memory leak on ah on error return path
>>> 3e5f088 IB/hns: Avoid compile test under non 64bit environments
>>> 8ccf098 Revert "RDMA/hns: fix build regression"
>>> 5db465f IB/hns: checking for IS_ERR() instead of NULL
>>> 967de35 IB/hns: include linux/interrupt.h
>>> ecd840f RDMA/hns: fix build regression
>>> d1d7149 IB/hns: fix semicolon.cocci warnings
>>> 87809f8 IB/hns: fix returnvar.cocci warnings
>>> 3756c7f IB/hns: fix boolreturn.cocci warnings
>>> e89bf46 IB/hns: Support compile test for hns RoCE driver
>>> 5f110ac4 IB/hns: Fix for checkpatch.pl comment style warnings
>>> d322f00 IB/hns: Fix the bug with modifying the MAC address without
>>> removing the driver
>>> 9de61d3 IB/hns: Fix the bug with rdma operation
>>> 58c4f0d IB/hns: Fix the bug with wild pointer when destroy rc qp
>>>
>>> 2. k.o/net-next-base
>>>
>>> git log --oneline drivers/infiniband/hw/hns/
>>>
>>> 5db465f IB/hns: checking for IS_ERR() instead of NULL
>>> 5f110ac4 IB/hns: Fix for checkpatch.pl comment style warnings
>>> d322f00 IB/hns: Fix the bug with modifying the MAC address without
>>> removing the driver
>>> 9de61d3 IB/hns: Fix the bug with rdma operation
>>> 58c4f0d IB/hns: Fix the bug with wild pointer when destroy rc qp
>>>
>>>
>>> Regards
>>> Wei Hu
>>>
>> Please use net-next-base. Doug have comfirm. Please refer to his
>> reply for this email.
> The net-next-based branch is not intended to go to the next kernel
> merge window, it's destined for the merge window after that. If you
> don't need anything in net-next-based, then use for-next instead.
> That's what will actually be going to Linus.
>
> As for what's newer, the for-next-merged branch is everything merged
> together (for-4.13-rc, for-next, and net-next-based), and I really only
> have it there for one reason: so I can put the for-next tag on it and
> Stephen Rothwell can then pull it into his for-next kernel testing. I
> put stuff in there (the net-next-based branch) that isn't going into
> the next merge window so that it gets early for-next testing, but that
> doesn't mean it is actually going into for-next.
>
> So, like I said, use the for-next branch unless you absolutely depend
> on code in the net-next-based branch, and if you do, it means the
> submission will flow through into the second merge window instead of
> the next merge window.
Thanks , Doug.
--
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] 5+ messages in thread
end of thread, other threads:[~2017-08-29 1:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <33078683-cf77-a116-4245-f561a29b114d@huawei.com>
[not found] ` <33078683-cf77-a116-4245-f561a29b114d-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2017-08-21 12:57 ` 【Ask for upstream branch】 Doug Ledford
[not found] ` <546382b6-7cdc-9277-c0b8-130d58136a88-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-08-24 7:35 ` Wei Hu (Xavier)
[not found] ` <599E81AF.5040901-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2017-08-24 8:34 ` oulijun
[not found] ` <a6ed9854-46f0-77be-a708-de7b2100a58c-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2017-08-24 19:31 ` Doug Ledford
[not found] ` <1503603071.78641.35.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-08-29 1:01 ` Wei Hu (Xavier)
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.