mbox series

[GIT,PULL] nfsd changes for 5.11-rc

Message ID BEF46BF0-8B84-468C-B88C-33202C786E7E@oracle.com (mailing list archive)
State New
Headers show
Series [GIT,PULL] nfsd changes for 5.11-rc | expand

Pull-request

git://git.linux-nfs.org/projects/cel/cel-2.6.git 7b723008f9c95624c848fad661c01b06e47b20da

Message

Chuck Lever Jan. 11, 2021, 2:40 p.m. UTC
Hi Linus-

The following changes since commit 5ee863bec794f30bdf7fdf57ce0d9f579b0d1aa3:

  Merge branch 'parisc-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux (2020-12-16 12:10:40 -0800)

are available in the Git repository at:

  git://git.linux-nfs.org/projects/cel/cel-2.6.git 7b723008f9c95624c848fad661c01b06e47b20da

for you to fetch changes up to 7b723008f9c95624c848fad661c01b06e47b20da:

  NFSD: Restore NFSv4 decoding's SAVEMEM functionality (2020-12-18 12:28:58 -0500)

----------------------------------------------------------------
Chuck Lever (3):
      NFSD: Fix sparse warning in nfssvc.c
      SUNRPC: Handle TCP socket sends with kernel_sendpage() again
      NFSD: Restore NFSv4 decoding's SAVEMEM functionality

Trond Myklebust (2):
      nfsd: Fixes for nfsd4_encode_read_plus_data()
      nfsd: Don't set eof on a truncated READ_PLUS

 fs/nfsd/nfs4proc.c   |  5 +++++
 fs/nfsd/nfs4xdr.c    | 56 ++++++++++++++++++++++++++++++++++++--------------------
 fs/nfsd/nfssvc.c     |  6 ------
 fs/nfsd/xdr4.h       |  1 -
 net/sunrpc/svcsock.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 126 insertions(+), 28 deletions(-)

--
Chuck Lever

Comments

Linus Torvalds Jan. 11, 2021, 7:36 p.m. UTC | #1
On Mon, Jan 11, 2021 at 6:40 AM Chuck Lever <chuck.lever@oracle.com> wrote:
>
>   git://git.linux-nfs.org/projects/cel/cel-2.6.git 7b723008f9c95624c848fad661c01b06e47b20da

This works, but it's _really_ not very legible in the resulting merge
commit message.

I think you meant for me to pull "tags/nfsd-5.11-1" which does point
to that commit.

That would also have made git-request-pull generate a better
description in this email.

I will do that, but please check what odd scripting or whatever you
had that caused this mess...

            Linus
Chuck Lever Jan. 11, 2021, 7:39 p.m. UTC | #2
> On Jan 11, 2021, at 2:36 PM, Linus Torvalds <torvalds@linux-foundation.org> wrote:
> 
> On Mon, Jan 11, 2021 at 6:40 AM Chuck Lever <chuck.lever@oracle.com> wrote:
>> 
>>  git://git.linux-nfs.org/projects/cel/cel-2.6.git 7b723008f9c95624c848fad661c01b06e47b20da
> 
> This works, but it's _really_ not very legible in the resulting merge
> commit message.
> 
> I think you meant for me to pull "tags/nfsd-5.11-1" which does point
> to that commit.

Yes, I did. Apologies.


> That would also have made git-request-pull generate a better
> description in this email.
> 
> I will do that, but please check what odd scripting or whatever you
> had that caused this mess...
> 
>            Linus

--
Chuck Lever
pr-tracker-bot@kernel.org Jan. 11, 2021, 8:14 p.m. UTC | #3
The pull request you sent on Mon, 11 Jan 2021 09:40:40 -0500:

> git://git.linux-nfs.org/projects/cel/cel-2.6.git 7b723008f9c95624c848fad661c01b06e47b20da

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/c912fd05fab97934e4cf579654d0dc4835b4758c

Thank you!