| commit | a9866ba47c3e7b7665b5f08fa6ef684f3285c939 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 18 09:28:11 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 18 09:28:11 2012 -0700 |
| tree | 1d3977c467148892532f683ac5fcc4534c672b5d | |
| parent | 331ae4962b975246944ea039697a8f1cadce42bb [diff] | |
| parent | cd60042cc1392e79410dc8de9e9c1abb38a29e57 [diff] |
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