tree c856b06963c2a8ae0c312f012ec3d740e89c07d0
parent 54f70f52e3b3a26164220d98a712a274bd28502f
parent 7e682f766f289887c5cbf7c0a1e4970103f01ac4
author Linus Torvalds <torvalds@linux-foundation.org> 1504324647 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1504324647 -0700

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs version warning fix from Steve French:
 "As requested, additional kernel warning messages to clarify the
  default dialect changes"

[ There is still some discussion about exactly which version should be
  the new default.  Longer-term we have auto-negotiation coming, but
  that's not there yet..  - Linus ]

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  Fix warning messages when mounting to older servers