linux-next: manual merge of the tty tree with the powerpc tree

[Stephen Rothwell]

Hi all,

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

  arch/powerpc/include/asm/fs_pd.h

between commits:

  e6e077cb2aa4 ("powerpc/include: Declare mpc8xx_immr in 8xx_immap.h")
  fecc436a97af ("powerpc/include: Remove mpc8260.h and m82xx_pci.h")
  fbbf4280dae4 ("powerpc/8xx: Remove immr_map() and immr_unmap()")
  7768716d2f19 ("powerpc/cpm2: Remove cpm2_map() and cpm2_unmap()")

from the powerpc tree and commit:

  c2d6c1b4f034 ("serial: cpm_uart: Use get_baudrate() instead of uart_baudrate()")

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.

Note that after all the above are applied, it looks like this file can
be removed completely as nothing in the tree includes it any more.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/powerpc/include/asm/fs_pd.h
index d530f68b4eef,7b61b80f212d..000000000000
--- a/arch/powerpc/include/asm/fs_pd.h
+++ b/arch/powerpc/include/asm/fs_pd.h
@@@ -14,14 -14,26 +14,4 @@@
  #include <sysdev/fsl_soc.h>
  #include <asm/time.h>
  
- static inline int uart_baudrate(void)
- {
-         return get_baudrate();
- }
 -#ifdef CONFIG_CPM2
 -#include <asm/cpm2.h>
--
- static inline int uart_clock(void)
- {
-         return ppc_proc_freq;
- }
 -#if defined(CONFIG_8260)
 -#include <asm/mpc8260.h>
 -#endif
 -
 -#define cpm2_map(member) (&cpm2_immr->member)
 -#define cpm2_map_size(member, size) (&cpm2_immr->member)
 -#define cpm2_unmap(addr) do {} while(0)
 -#endif
 -
 -#ifdef CONFIG_PPC_8xx
 -#include <asm/8xx_immap.h>
 -
 -extern immap_t __iomem *mpc8xx_immr;
 -
 -#define immr_map(member) (&mpc8xx_immr->member)
 -#define immr_map_size(member, size) (&mpc8xx_immr->member)
 -#define immr_unmap(addr) do {} while (0)
 -#endif
--
  #endif

Attachment: pgpfAEl2lGIaI.pgp
Description: OpenPGP digital signature