Merge branch 'ptmx-cleanup'
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Apr 2016 23:36:18 +0000 (16:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Apr 2016 23:36:18 +0000 (16:36 -0700)
commit9a0e3eea25d3ab267aff9d4eaed83fbe46d989d0
treeecd334957a0c62bcd4fe2fe9feea53ba9a6905cf
parent12566cc35d0e68308bde7aad615743d560cb097b
parent67245ff332064c01b760afa7a384ccda024bfd24
Merge branch 'ptmx-cleanup'

Merge the ptmx internal interface cleanup branch.

This doesn't change semantics, but it should be a sane basis for
eventually getting the multi-instance devpts code into some sane shape
where we can get rid of the kernel config option.  Which we can
hopefully get done next merge window..

* ptmx-cleanup:
  devpts: clean up interface to pty drivers