]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Sep 2017 03:57:27 +0000 (20:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Sep 2017 03:57:27 +0000 (20:57 -0700)
commitd0d6ab53c9abd7dd1070f43a0455328874127ba8
treec856b06963c2a8ae0c312f012ec3d740e89c07d0
parent54f70f52e3b3a26164220d98a712a274bd28502f
parent7e682f766f289887c5cbf7c0a1e4970103f01ac4
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