Re: please pull nfsd changes for 3.14

["J. Bruce Fields" <bfields@fieldses.org>]

On Thu, Jan 30, 2014 at 10:23:06AM -0800, Linus Torvalds wrote:
> On Wed, Jan 29, 2014 at 10:54 AM, J. Bruce Fields <bfields@fieldses.org> wrote:
> >
> > Stephen Rothwell noted a merge conflict:
> >
> > http://marc.info/?i=<20140129124238.6e1667abab08be8be2dafe01@canb.auug.org.au>
> >
> > I'm assuming as usual you'll handle it and let me know if you need
> > anything from me.
> 
> Heh. The conflict was trivial, and git does 99% of it automatically -
> leaving just the header file inclusions to be resolved manually
> because they were right next to each other. The resolution just looks
> scarier than it is because there were other changes that did resolve
> cleanly, but that were "close enough" to each other that the context
> overlapped, so they are shown too..
> 
> But yes, had it actually been complicated, I'd probably still have
> done it, and perhaps asked you to verify it. We did have a couple of
> more serious conflicts in this merge window.

Good, thanks!

--b.