Hi all,

Today's linux-next merge of the tty tree got a conflict in:

  drivers/tty/serial/8250/8250_rsa.c

between commit:

  2bf95a9bcb50 ("serial: 8250: Fix 8250_rsa symbol loop")

from the tty.current tree and commit:

  37d55c92e9db ("serial: drop SERIAL_8250_DEPRECATED_OPTIONS")

from the tty tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/tty/serial/8250/8250_rsa.c
index 1f182f165525,3b9c00515407..000000000000
--- a/drivers/tty/serial/8250/8250_rsa.c
+++ b/drivers/tty/serial/8250/8250_rsa.c
@@@ -209,27 -200,4 +209,3 @@@ void rsa_reset(struct uart_8250_port *u
  
  	serial_out(up, UART_RSA_FRR, 0);
  }
- 
- #ifdef CONFIG_SERIAL_8250_DEPRECATED_OPTIONS
- #ifndef MODULE
- /*
-  * Keep the old "8250" name working as well for the module options so we don't
-  * break people. We need to keep the names identical and the convenient macros
-  * will happily refuse to let us do that by failing the build with redefinition
-  * errors of global variables.  So we stick them inside a dummy function to
-  * avoid those conflicts.  The options still get parsed, and the redefined
-  * MODULE_PARAM_PREFIX lets us keep the "8250." syntax alive.
-  *
-  * This is hacky. I'm sorry.
-  */
- static void __used rsa8250_options(void)
- {
- #undef MODULE_PARAM_PREFIX
- #define MODULE_PARAM_PREFIX "8250_core."
- 
- 	__module_param_call(MODULE_PARAM_PREFIX, probe_rsa,
- 		&param_array_ops, .arr = &__param_arr_probe_rsa,
- 		0444, -1, 0);
- }
- #endif
- #endif
 -EXPORT_SYMBOL_FOR_MODULES(rsa_reset, "8250_base");