On Mon, Mar 18, 2019 at 10:54:16AM +0200, Shamir Rabinovitch wrote:
> On Wed, Mar 06, 2019 at 02:36:10PM -0400, Jason Gunthorpe wrote:
> > On Wed, Mar 06, 2019 at 11:18:27AM +0200, Shamir Rabinovitch wrote:
> > > On Tue, Feb 26, 2019 at 02:44:52PM +0200, Shamir Rabinovitch wrote:
> > > > This patch set continue the cleanup started with prior series. This
> > > > patch set clean the ib_xxx destroy APIs because those APIs do have
> > > > ib_udata.
> > > >
> > > > The final goal of this cleanup is to remove the dependency in the IB
> > > > code in the ib_xxx->uobject pointer as step toward shared ib_xxx
> > > > objects.
> > > >
> > > > This series also remove ib_ucontext from functions signature where
> > > > ib_udata is available.
> > > >
> > > > Shamir Rabinovitch (5):
> > > > IB/{rdma,core}: ucontext should be set properly for all cmd & ioctl
> > > > paths
> > > > IB/{core,hw}: pass uverbs_attr_bundle down uobject destroy path
> > > > IB/{core,hw,sw}: pass uverbs_attr_bundle down ib_x destroy path
> > > > IB:{core,hw}: remove 'uobject->context' dependency in object destroy
> > > > APIs
> > > > IB/{core,hw,sw}: pass only ib_udata in function prototypes
> > > >
>
> [...]
>
> > >
> > > Jason, maybe you did not see it because I did not add your mail.
> > > Do you want me to re-base on wip/jgg-for-next again and re-send?
> >
> > We are at the merge window, so this will need to be rebased onto
> > 5.1-rc1 in two weeks
> >
> > Jason
>
> Jason,
>
> 5.1-rc1 is merged in to branch 'master'.
> Last cycle I was asked by you to work on wip/jgg-for-next .
That was a short lived advice
> The wip/jgg-for-next does not have the latest 5.1-rc1 commits.
It is still getting updated
> What branch should I use for this re-base?
You should generally use the appropriate branch of:
latest -rc from Linus
rdma.git's for-next
rdma.git's wip/XX/for-next
To minimize the conflicts your work has. If you are badly conflicting
with things that were recently accepted then you have to respin. Many
things can just track -rc as they don't step over work other people
are doing.
In your case you are touching almost everything, so you really need to
use the newest code when sending patches to avoid conflicts.
Jason
