From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Jul 2016 16:20:12 +0000 (-0700)
Subject: Merge tag 'tty-4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: v4.14-rc1~2949
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=756c0aeca3c2deeadf331394b7ae4a3b2cb4d401;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'tty-4.7-rc6' of git://git./linux/kernel/git/gregkh/tty

Pull tty fixes from Greg KH:
 "Here are two tty fixes for some reported issues.  One resolves a crash
  in devpts, and the other resolves a problem with the fbcon cursor
  blink causing lockups.

  Both have been in linux-next with no reported problems"

* tag 'tty-4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  devpts: fix null pointer dereference on failed memory allocation
  tty: vt: Fix soft lockup in fbcon cursor blink timer.
---

756c0aeca3c2deeadf331394b7ae4a3b2cb4d401