summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4recover.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-12-05 18:57:34 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2017-12-05 18:57:34 +0100
commit73996933b53ff396d63a7fccd8e824758634dc19 (patch)
treebd950af66319d6b2f28e23889ee38f580771c6af /fs/nfsd/nfs4recover.c
parentMerge tag 'tty-4.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gre... (diff)
parentMerge tag 'iio-fixes-for-4.15a' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
downloadlinux-73996933b53ff396d63a7fccd8e824758634dc19.tar.xz
linux-73996933b53ff396d63a7fccd8e824758634dc19.zip
Merge tag 'staging-4.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging and iio driver fixes from Greg KH: "Here are a number of small staging and iio driver fixes for reported issues for 4.15-rc3. Nothing major here, the majority is IIO issues, like normal, but there are also some small bugfixes for a few staging drivers as well. Full details are in the shortlog. All of these have been in linux-next for a while with no reported issues" * tag 'staging-4.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: iio: stm32: fix adc/trigger link error iio: health: max30102: Temperature should be in milli Celsius iio: fix kernel-doc build errors iio: adc: meson-saradc: Meson8 and Meson8b do not have REG11 and REG13 iio: adc: meson-saradc: initialize the bandgap correctly on older SoCs iio: adc: meson-saradc: fix the bit_idx of the adc_en clock iio: proximity: sx9500: Assign interrupt from GpioIo() iio: adc: cpcap: fix incorrect validation staging: octeon-usb: use __delay() instead of cvmx_wait() staging: rtl8188eu: Fix incorrect response to SIOCGIWESSID staging: ccree: fix leak of import() after init() staging: comedi: ni_atmio: fix license warning.
Diffstat (limited to 'fs/nfsd/nfs4recover.c')
0 files changed, 0 insertions, 0 deletions