From: Linus Torvalds <torvalds@linux-foundation.org> Date: Fri, 25 Sep 2020 17:46:11 +0000 (-0700) Subject: Merge tag 'nfsd-5.9-2' of git://git.linux-nfs.org/projects/cel/cel-2.6 X-Git-Tag: howlett/maple_spf/20210104~993 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6d28cf7dfede6cfca5119a0d415a6a447c68f3a0;p=users%2Fjedix%2Flinux-maple.git Merge tag 'nfsd-5.9-2' of git://git.linux-nfs.org/projects/cel/cel-2.6 Pull NFS server fix from Chuck Lever: "Fix incorrect calculation on platforms that implement flush_dcache_page()" * tag 'nfsd-5.9-2' of git://git.linux-nfs.org/projects/cel/cel-2.6: SUNRPC: Fix svc_flush_dcache() --- 6d28cf7dfede6cfca5119a0d415a6a447c68f3a0