netdev - linux-next: manual merge of the tty tree with the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230809133723.2ebeddd7@canb.auug.org.au>
Date: Wed, 9 Aug 2023 13:37:23 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>, David Miller <davem@...emloft.net>, Jakub
 Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>
Cc: Networking <netdev@...r.kernel.org>, Christophe Leroy
 <christophe.leroy@...roup.eu>, Greg Kroah-Hartman
 <gregkh@...uxfoundation.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the tty tree with the net-next tree

Hi all,

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

  arch/powerpc/sysdev/fsl_soc.c

between commit:

  62e106c802c5 ("net: fs_enet: Remove stale prototypes from fsl_soc.c")

from the net-next tree and commit:

  80a8f487b9ba ("serial: cpm_uart: Remove stale prototype in powerpc/fsl_soc.c")

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 arch/powerpc/sysdev/fsl_soc.c
index 528506f6e2b8,99fc4c3b94fa..000000000000
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@@ -22,7 -22,8 +22,6 @@@
  #include <linux/phy.h>
  #include <linux/spi/spi.h>
  #include <linux/fsl_devices.h>
- #include <linux/fs_uart_pd.h>
 -#include <linux/fs_enet_pd.h>
  #include <linux/reboot.h>
  
  #include <linux/atomic.h>
@@@ -35,7 -36,8 +34,6 @@@
  #include <asm/cpm2.h>
  #include <asm/fsl_hcalls.h>	/* For the Freescale hypervisor */
  
- extern void init_smc_ioports(struct fs_uart_platform_info*);
 -extern void init_fcc_ioports(struct fs_platform_info*);
 -extern void init_fec_ioports(struct fs_platform_info*);
  static phys_addr_t immrbase = -1;
  
  phys_addr_t get_immrbase(void)

Content of type "application/pgp-signature" skipped