diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2017-06-28 19:34:15 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2017-06-28 19:34:15 +0200 |
| commit | 9a1d168e1bc2893120bb7c0d9932dd22f97d0b55 (patch) | |
| tree | f7d419f1601419aa0aebda102a6b14bdf7653443 /arch/sparc/lib/Makefile | |
| parent | nfsd4: const-ify nfsd4_ops (diff) | |
| parent | Linux 4.12-rc5 (diff) | |
| download | linux-9a1d168e1bc2893120bb7c0d9932dd22f97d0b55.tar.xz linux-9a1d168e1bc2893120bb7c0d9932dd22f97d0b55.zip | |
Merge tag 'v4.12-rc5' into nfsd tree
Update to get f0c3192ceee3 "virtio_net: lower limit on buffer size".
That bug was interfering with my nfsd testing.
Diffstat (limited to 'arch/sparc/lib/Makefile')
| -rw-r--r-- | arch/sparc/lib/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile index 69912d2f8b54..07c03e72d812 100644 --- a/arch/sparc/lib/Makefile +++ b/arch/sparc/lib/Makefile @@ -15,6 +15,7 @@ lib-$(CONFIG_SPARC32) += copy_user.o locks.o lib-$(CONFIG_SPARC64) += atomic_64.o lib-$(CONFIG_SPARC32) += lshrdi3.o ashldi3.o lib-$(CONFIG_SPARC32) += muldi3.o bitext.o cmpdi2.o +lib-$(CONFIG_SPARC64) += multi3.o lib-$(CONFIG_SPARC64) += copy_page.o clear_page.o bzero.o lib-$(CONFIG_SPARC64) += csum_copy.o csum_copy_from_user.o csum_copy_to_user.o |