On Mon, Dec 1, 2014 at 2:56 PM, J. Bruce Fields <bfields@xxxxxxxxxxxx> wrote: > On Thu, Nov 20, 2014 at 09:17:44AM -0500, Anna Schumaker wrote: >> On 11/19/2014 04:59 PM, Jeff Layton wrote: >> > On Wed, 19 Nov 2014 16:37:58 -0500 >> > "J. Bruce Fields" <bfields@xxxxxxxxxxxx> wrote: >> > >> >> On Wed, Nov 19, 2014 at 07:51:12AM -0500, Jeff Layton wrote: >> >>> Patch #1 in this series is a bugfix, but probably isn't worth sending to >> >>> stable. The rest are just cleanups in preparation for some other patches >> >>> that I have queued up. Can you consider these for 3.19? >> >> Sure, I've read through them, they look fine. >> >> >> >> When I tried to apply them to my for-3.19 there were rejects due to >> >> tracing stuff in include/trace/events/sunrpc.h. I haven't tried to >> >> investigate yet. >> >> >> >> --b. >> >> >> > Ahh yeah. These are based on top of the tracepoint patches I sent to >> > Trond a couple of weeks ago. I think he's planning to merge those in >> > 3.19 too, but I don't think he's done that yet. Anna may have though... >> >> I have them in a private tree on my laptop that I use for testing. Want me to push them out somewhere? > > That'd help me at least test, but we need something more than a > temporary testing branch to get ready for the merge window. Choices > include: > > - Trond merges them all now, I pull that and apply these on top. > - I merge them instead, or we divide the patches between us > somehow. Worst case, it's probably even OK if there's a patch > or two that we both apply. > > In any case we need to get that sorted out now-ish as the merge window's > probably starting next week. > All patches that I plan on merging for the next window were pushed out last Friday. Jeff's tracepoint and debugfs patchset should therefore be present in my nfs-for-next and linux-next branches on git.linux-nfs.org. -- Trond Myklebust Linux NFS client maintainer, PrimaryData trond.myklebust@xxxxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
