From: Linus Torvalds Date: Wed, 7 Mar 2007 01:32:22 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Tag: firefly_0821_release~30771 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9f6632d6290785caf9e9f874c0a0cfaf2c178e59;p=firefly-linux-kernel-4.4.55.git Merge git://git./linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] cifs_prepare_write was incorrectly rereading page in some cases [CIFS] Fix set file size to zero when doing chmod to Samba 3.0.26pre [CIFS] Remove some unused functions/declarations [CIFS] New file for previous commit [CIFS] cifs export operations [CIFS] small piece missing from previous patch [CIFS] Fix locking problem around some cifs uses of i_size write --- 9f6632d6290785caf9e9f874c0a0cfaf2c178e59