From: Linus Torvalds Date: Wed, 18 Jul 2012 16:28:11 +0000 (-0700) Subject: Merge git://git.samba.org/sfrench/cifs-2.6 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a9866ba47c3e7b7665b5f08fa6ef684f3285c939;p=openwrt%2Fstaging%2Fblogic.git Merge git://git.samba.org/sfrench/cifs-2.6 Pull CIFS fixes from Steve French. * git://git.samba.org/sfrench/cifs-2.6: cifs: always update the inode cache with the results from a FIND_* cifs: when CONFIG_HIGHMEM is set, serialize the read/write kmaps cifs: on CONFIG_HIGHMEM machines, limit the rsize/wsize to the kmap space Initialise mid_q_entry before putting it on the pending queue --- a9866ba47c3e7b7665b5f08fa6ef684f3285c939