Hi Greg, After merging the tty tree, today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/staging/dgrp/dgrp_net_ops.c: In function 'dgrp_input':
drivers/staging/dgrp/dgrp_net_ops.c:216:27: error: 'struct tty_struct' has no
member named 'real_raw'
drivers/staging/dgrp/dgrp_net_ops.c:229:8: error: 'struct tty_struct' has no
member named 'read_cnt'
drivers/staging/dgrp/dgrp_net_ops.c:229:8: error: 'struct tty_struct' has no
member named 'read_cnt'
drivers/staging/dgrp/dgrp_net_ops.c:261:30: error: 'struct tty_struct' has no
member named 'real_raw'
drivers/staging/dgrp/dgrp_net_ops.c:276:28: error: 'struct tty_struct' has no
member named 'real_raw'
Caused by commits 53c5ee2cfb4d ("TTY: move ldisc data from tty_struct:
simple members") and ba2e68ac6157 ("TTY: move ldisc data from tty_struct:
read_* and echo_* and canon_* stuff") interacting with commit
0b52b7497271 ("staging: Add dgrp driver for Digi Realport devices") now
in Linus' tree.
I disabled building of the dgrp driver for now using this merge fix patch:
From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Wed, 24 Oct 2012 13:25:29 +1100
Subject: [PATCH] staging: disable dgrp driver since it is broken by tty
changes
drivers/staging/dgrp/dgrp_net_ops.c: In function 'dgrp_input':
drivers/staging/dgrp/dgrp_net_ops.c:216:27: error: 'struct tty_struct' has no
member named 'real_raw'
drivers/staging/dgrp/dgrp_net_ops.c:229:8: error: 'struct tty_struct' has no
member named 'read_cnt'
drivers/staging/dgrp/dgrp_net_ops.c:229:8: error: 'struct tty_struct' has no
member named 'read_cnt'
drivers/staging/dgrp/dgrp_net_ops.c:261:30: error: 'struct tty_struct' has no
member named 'real_raw'
drivers/staging/dgrp/dgrp_net_ops.c:276:28: error: 'struct tty_struct' has no
member named 'real_raw'
Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
---
drivers/staging/dgrp/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/staging/dgrp/Kconfig b/drivers/staging/dgrp/Kconfig
index 39f4bb6..7d378c2 100644
--- a/drivers/staging/dgrp/Kconfig
+++ b/drivers/staging/dgrp/Kconfig
@@ -2,6 +2,7 @@ config DGRP
tristate "Digi Realport driver"
default n
depends on SYSFS
+ depends on BROKEN
---help---
Support for Digi Realport devices. These devices allow you to
access remote serial ports as if they are local tty devices. This
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
pgppps6H5SaZZ.pgp
Description: PGP signature
