diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2021-03-30 17:10:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-03-30 17:10:04 +0200 |
| commit | 7a842f5f3a816a818dc89e4ec4cffb7a32a38543 (patch) | |
| tree | 2fd15f52c696715e7ac924bd24c663c8ad0ce7e7 /fs/nfs/Kconfig | |
| parent | 93fb0db791be7e8df3d91d046a4259e341782972 (diff) | |
| parent | 9b39031dfb888804c0393ae4156223b476c699b4 (diff) | |
Merge 4.4.264 into android-4.4-p
Changes in 4.4.264
net: fec: ptp: avoid register access when ipg clock is disabled
powerpc/4xx: Fix build errors from mfdcr()
atm: eni: dont release is never initialized
atm: lanai: dont run lanai_dev_close if not open
net: tehuti: fix error return code in bdx_probe()
sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count
nfs: fix PNFS_FLEXFILE_LAYOUT Kconfig default
NFS: Correct size calculation for create reply length
atm: uPD98402: fix incorrect allocation
atm: idt77252: fix null-ptr-dereference
u64_stats,lockdep: Fix u64_stats_init() vs lockdep
nfs: we don't support removing system.nfs4_acl
ia64: fix ia64_syscall_get_set_arguments() for break-based syscalls
ia64: fix ptrace(PTRACE_SYSCALL_INFO_EXIT) sign
x86/tlb: Flush global mappings when KAISER is disabled
squashfs: fix inode lookup sanity checks
squashfs: fix xattr id and id lookup sanity checks
bus: omap_l3_noc: mark l3 irqs as IRQF_NO_THREAD
macvlan: macvlan_count_rx() needs to be aware of preemption
net: dsa: bcm_sf2: Qualify phydev->dev_flags based on port
e1000e: add rtnl_lock() to e1000_reset_task
e1000e: Fix error handling in e1000_set_d0_lplu_state_82571
net/qlcnic: Fix a use after free in qlcnic_83xx_get_minidump_template
can: c_can_pci: c_can_pci_remove(): fix use-after-free
can: c_can: move runtime PM enable/disable to c_can_platform
can: m_can: m_can_do_rx_poll(): fix extraneous msg loss warning
mac80211: fix rate mask reset
net: cdc-phonet: fix data-interface release on probe failure
RDMA/cxgb4: Fix adapter LE hash errors while destroying ipv6 listening server
perf auxtrace: Fix auxtrace queue conflict
can: dev: Move device back to init netns on owning netns delete
net: sched: validate stab values
mac80211: fix double free in ibss_leave
xen-blkback: don't leak persistent grants from xen_blkbk_map()
Linux 4.4.264
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia5e96dcf0093856869326d47098ca43a42a88b35
Diffstat (limited to 'fs/nfs/Kconfig')
| -rw-r--r-- | fs/nfs/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig index c3428767332c..55ebf9f4a824 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig @@ -132,7 +132,7 @@ config PNFS_OBJLAYOUT config PNFS_FLEXFILE_LAYOUT tristate depends on NFS_V4_1 && NFS_V3 - default m + default NFS_V4 config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN string "NFSv4.1 Implementation ID Domain" |