kernel: pick earlycon regression fixes from the stable-queue.git

[oweals/openwrt.git] / target / linux / generic / pending-3.18 / 081-07-ppp-remove-PPPOX_ZOMBIE-socket-state.patch

diff --git a/target/linux/generic/pending-3.18/081-07-ppp-remove-PPPOX_ZOMBIE-socket-state.patch b/target/linux/generic/pending-3.18/081-07-ppp-remove-PPPOX_ZOMBIE-socket-state.patch
index ffdba4d923f9347eee1bf36afd29f607f5562120..28ec03b410e3be01733135a5f1da6e5da331c225 100644 (file)
--- a/target/linux/generic/pending-3.18/081-07-ppp-remove-PPPOX_ZOMBIE-socket-state.patch
+++ b/target/linux/generic/pending-3.18/081-07-ppp-remove-PPPOX_ZOMBIE-socket-state.patch
@@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                                pppox_unbind_sock(sk);
                                sk->sk_state_change(sk);
                                po->pppoe_dev = NULL;
-@@ -775,7 +775,7 @@ static int pppoe_ioctl(struct socket *so
+@@ -779,7 +779,7 @@ static int pppoe_ioctl(struct socket *so
                struct pppox_sock *relay_po;
  
                err = -EBUSY;