linux-next: manual merge of the cisco tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  arch/powerpc/configs/skiroot_defconfig

between commit:

  805bf3b75529 ("powerpc/configs: Sync skiroot defconfig")

from Linus' tree and commit:

  5d4514a9c291 ("powerpc: convert config files to generic cmdline")

from the cisco 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/configs/skiroot_defconfig
index 5ba131c30f6b,bf31334efbce..000000000000
--- a/arch/powerpc/configs/skiroot_defconfig
+++ b/arch/powerpc/configs/skiroot_defconfig
@@@ -48,14 -40,22 +43,26 @@@ CONFIG_HZ_100=
  CONFIG_KEXEC=y
  CONFIG_IRQ_ALL_CPUS=y
  CONFIG_NUMA=y
 +# CONFIG_COMPACTION is not set
 +# CONFIG_MIGRATION is not set
  CONFIG_PPC_64K_PAGES=y
  CONFIG_SCHED_SMT=y
 +CONFIG_CMDLINE_BOOL=y
- CONFIG_CMDLINE="console=tty0 console=hvc0 ipr.fast_reboot=1 quiet"
++CONFIG_CMDLINE_PREPEND="console=tty0 console=hvc0 ipr.fast_reboot=1 quiet"
  # CONFIG_SECCOMP is not set
  # CONFIG_PPC_MEM_KEYS is not set
+ CONFIG_JUMP_LABEL=y
+ CONFIG_STRICT_KERNEL_RWX=y
+ CONFIG_MODULES=y
+ CONFIG_MODULE_UNLOAD=y
+ CONFIG_MODULE_SIG=y
+ CONFIG_MODULE_SIG_FORCE=y
+ CONFIG_MODULE_SIG_SHA512=y
+ CONFIG_PARTITION_ADVANCED=y
+ # CONFIG_IOSCHED_DEADLINE is not set
+ # CONFIG_COMPACTION is not set
+ # CONFIG_MIGRATION is not set
+ # CONFIG_BOUNCE is not set
  CONFIG_NET=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
@@@ -164,9 -159,9 +170,10 @@@ CONFIG_MLX4_EN=
  # CONFIG_MLX4_CORE_GEN2 is not set
  CONFIG_MLX5_CORE=m
  # CONFIG_NET_VENDOR_MICREL is not set
 +# CONFIG_NET_VENDOR_MICROSEMI is not set
  CONFIG_MYRI10GE=m
  # CONFIG_NET_VENDOR_NATSEMI is not set
+ CONFIG_S2IO=m
  # CONFIG_NET_VENDOR_NETRONOME is not set
  # CONFIG_NET_VENDOR_NI is not set
  # CONFIG_NET_VENDOR_NVIDIA is not set

Attachment: pgp8nVj97ugqt.pgp
Description: OpenPGP digital signature