Merge remote branch 'linus/master' into drm-intel-fixes

Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().

Conflicts:
	drivers/gpu/drm/i915/intel_ringbuffer.c

1 files changed, 0 insertions, 49 deletions

diff --git a/drivers/char/hvc_irq.c b/drivers/char/hvc_irq.c
deleted file mode 100644
index 2623e177e8d..00000000000
--- a/drivers/char/hvc_irq.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright IBM Corp. 2001,2008
- *
- * This file contains the IRQ specific code for hvc_console
- *
- */
-
-#include <linux/interrupt.h>
-
-#include "hvc_console.h"
-
-static irqreturn_t hvc_handle_interrupt(int irq, void *dev_instance)
-{
-	/* if hvc_poll request a repoll, then kick the hvcd thread */
-	if (hvc_poll(dev_instance))
-		hvc_kick();
-	return IRQ_HANDLED;
-}
-
-/*
- * For IRQ based systems these callbacks can be used
- */
-int notifier_add_irq(struct hvc_struct *hp, int irq)
-{
-	int rc;
-
-	if (!irq) {
-		hp->irq_requested = 0;
-		return 0;
-	}
-	rc = request_irq(irq, hvc_handle_interrupt, IRQF_DISABLED,
-			   "hvc_console", hp);
-	if (!rc)
-		hp->irq_requested = 1;
-	return rc;
-}
-
-void notifier_del_irq(struct hvc_struct *hp, int irq)
-{
-	if (!hp->irq_requested)
-		return;
-	free_irq(irq, hp);
-	hp->irq_requested = 0;
-}
-
-void notifier_hangup_irq(struct hvc_struct *hp, int irq)
-{
-	notifier_del_irq(hp, irq);
-}