Loading Documentation/filesystems/overlayfs.txt +1 −1 Original line number Diff line number Diff line Loading @@ -64,7 +64,7 @@ is formed. At mount time, the two directories given as mount options "lowerdir" and "upperdir" are combined into a merged directory: mount -t overlayfs overlayfs -olowerdir=/lower,upperdir=/upper,\ mount -t overlay overlay -olowerdir=/lower,upperdir=/upper,\ workdir=/work /merged The "workdir" needs to be an empty directory on the same filesystem Loading Documentation/networking/timestamping.txt +1 −1 Original line number Diff line number Diff line Loading @@ -136,7 +136,7 @@ SOF_TIMESTAMPING_OPT_ID: This option is implemented only for transmit timestamps. There, the timestamp is always looped along with a struct sock_extended_err. The option modifies field ee_info to pass an id that is unique The option modifies field ee_data to pass an id that is unique among all possibly concurrently outstanding timestamp requests for that socket. In practice, it is a monotonically increasing u32 (that wraps). Loading MAINTAINERS +4 −3 Original line number Diff line number Diff line Loading @@ -6908,11 +6908,12 @@ F: drivers/scsi/osd/ F: include/scsi/osd_* F: fs/exofs/ OVERLAYFS FILESYSTEM OVERLAY FILESYSTEM M: Miklos Szeredi <miklos@szeredi.hu> L: linux-fsdevel@vger.kernel.org L: linux-unionfs@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git S: Supported F: fs/overlayfs/* F: fs/overlayfs/ F: Documentation/filesystems/overlayfs.txt P54 WIRELESS DRIVER Loading Makefile +1 −1 Original line number Diff line number Diff line VERSION = 3 PATCHLEVEL = 18 SUBLEVEL = 0 EXTRAVERSION = -rc5 EXTRAVERSION = -rc6 NAME = Diseased Newt # *DOCUMENTATION* Loading arch/arm/boot/dts/exynos5250-snow.dts +4 −0 Original line number Diff line number Diff line Loading @@ -624,4 +624,8 @@ num-cs = <1>; }; &usbdrd_dwc3 { dr_mode = "host"; }; #include "cros-ec-keyboard.dtsi" Loading
Documentation/filesystems/overlayfs.txt +1 −1 Original line number Diff line number Diff line Loading @@ -64,7 +64,7 @@ is formed. At mount time, the two directories given as mount options "lowerdir" and "upperdir" are combined into a merged directory: mount -t overlayfs overlayfs -olowerdir=/lower,upperdir=/upper,\ mount -t overlay overlay -olowerdir=/lower,upperdir=/upper,\ workdir=/work /merged The "workdir" needs to be an empty directory on the same filesystem Loading
Documentation/networking/timestamping.txt +1 −1 Original line number Diff line number Diff line Loading @@ -136,7 +136,7 @@ SOF_TIMESTAMPING_OPT_ID: This option is implemented only for transmit timestamps. There, the timestamp is always looped along with a struct sock_extended_err. The option modifies field ee_info to pass an id that is unique The option modifies field ee_data to pass an id that is unique among all possibly concurrently outstanding timestamp requests for that socket. In practice, it is a monotonically increasing u32 (that wraps). Loading
MAINTAINERS +4 −3 Original line number Diff line number Diff line Loading @@ -6908,11 +6908,12 @@ F: drivers/scsi/osd/ F: include/scsi/osd_* F: fs/exofs/ OVERLAYFS FILESYSTEM OVERLAY FILESYSTEM M: Miklos Szeredi <miklos@szeredi.hu> L: linux-fsdevel@vger.kernel.org L: linux-unionfs@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git S: Supported F: fs/overlayfs/* F: fs/overlayfs/ F: Documentation/filesystems/overlayfs.txt P54 WIRELESS DRIVER Loading
Makefile +1 −1 Original line number Diff line number Diff line VERSION = 3 PATCHLEVEL = 18 SUBLEVEL = 0 EXTRAVERSION = -rc5 EXTRAVERSION = -rc6 NAME = Diseased Newt # *DOCUMENTATION* Loading
arch/arm/boot/dts/exynos5250-snow.dts +4 −0 Original line number Diff line number Diff line Loading @@ -624,4 +624,8 @@ num-cs = <1>; }; &usbdrd_dwc3 { dr_mode = "host"; }; #include "cros-ec-keyboard.dtsi"
