Re: please pull nfsd changes for 3.14

2014-01-30 Thread J. Bruce Fields
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 > wrote: > > > > Stephen Rothwell noted a merge conflict: > > > > http://marc.info/?i=<20140129124238.6e1667abab08be8be2daf...@canb.auug.org.au> > > > > I'm assuming as usual you'll

Re: please pull nfsd changes for 3.14

2014-01-30 Thread Linus Torvalds
On Wed, Jan 29, 2014 at 10:54 AM, J. Bruce Fields wrote: > > Stephen Rothwell noted a merge conflict: > > http://marc.info/?i=<20140129124238.6e1667abab08be8be2daf...@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