From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 19 Apr 2016 23:36:18 +0000 (-0700)
Subject: Merge branch 'ptmx-cleanup'
X-Git-Tag: v4.6-rc5~24
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9a0e3eea25d3ab267aff9d4eaed83fbe46d989d0;p=linux.git

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
---

9a0e3eea25d3ab267aff9d4eaed83fbe46d989d0