> -----Original Message----- > From: linux-rdma-owner@xxxxxxxxxxxxxxx [mailto:linux-rdma-owner@xxxxxxxxxxxxxxx] On Behalf Of Doug Ledford > Sent: Wednesday, December 23, 2015 9:19 PM > To: J. Bruce Fields; Chuck Lever > Cc: Christoph Hellwig; Anna Schumaker; Jason Gunthorpe; linux-rdma@xxxxxxxxxxxxxxx; ira.weiny; Or Gerlitz; Steve Wise; Or Gerlitz; Sagi > Grimberg > Subject: Re: device attr cleanup > > On 12/23/2015 04:31 PM, J. Bruce Fields wrote: > > On Thu, Dec 10, 2015 at 07:49:59PM -0500, Chuck Lever wrote: > >> > >>> On Dec 10, 2015, at 6:30 PM, Christoph Hellwig <hch@xxxxxxxxxxxxx> wrote: > >>> > >>> On Thu, Dec 10, 2015 at 11:07:03AM -0700, Jason Gunthorpe wrote: > >>>> The ARM folks do this sort of stuff on a regular basis.. Very early on > >>>> Doug prepares a topic branch with only the big change, NFS folks pull > >>>> it and then pull your work. Then Doug would send the topic branch to > >>>> Linus as soon as the merge window opens, then NFS would send theirs. > >>>> > >>>> This is alot less work overall than trying to sequence multiple > >>>> patches over multiple releases.. > >>> > >>> Agreed. Staging has alaways been a giant pain and things tend to never > >>> finish moving over that way if they are non-trivial enough. > >> > >> In that case: > >> > >> You need to make sure you have all the right Acks. I've added > >> Anna and Bruce to Ack the NFS-related portions. Santosh should > >> Ack the RDS part. > >> > >> http://git.infradead.org/users/hch/rdma.git/shortlog/refs/heads/ib_device_attr > > > > Fine by me. > > > >> Given the proximity to the holidays and the next merge window, > >> Doug will need to get a properly-acked topic branch published > >> in the next day or two so the rest of us can rebase and start > >> testing before the relevant parties disappear for the holiday. > > > > What branch should I be working from? > > That patch was very intrusive (and I didn't like the change to the > structure organization). An alternative patch was proposed and I took > it instead. The patch I took is much less intrusive, but you might > still need to adjust things slightly. I've pushed my current WIP > for-next branch to my github repo: > > git://github.com/dledford/linux.git for-next > > This branch might get rebased still yet before it gets pushed to my > official repo at k.o, but it is perfectly fine to check that your > patches will merge with my for-next branch without conflicts. > Hey Doug, I don't see this branch. Which branch has the accepted device attr change? Steve. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
