From: Linus Torvalds Date: Mon, 14 Sep 2015 19:49:15 +0000 (-0700) Subject: Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9c488de24f7264f08d341024bffdd637b4d04c96;p=linux-beck.git Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 Pull CIFS fixes from Steve French: "Two small cifs fixes" * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: [CIFS] mount option sec=none not displayed properly in /proc/mounts CIFS: fix type confusion in copy offload ioctl --- 9c488de24f7264f08d341024bffdd637b4d04c96