linux-next: manual merge of the slab tree with the mips tree

[Stephen Rothwell]

Hi all,

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

  arch/mips/configs/ci20_defconfig

between commit:

  e94c1e492139 ("MIPS: configs: CI20: Regenerate defconfig")

from the mips tree and commit:

  eb07c4f39c3e ("mm/slab: rename CONFIG_SLAB to CONFIG_SLAB_DEPRECATED")

from the slab 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/mips/configs/ci20_defconfig
index 920b27977dac,28eb15a1ffc4..000000000000
--- a/arch/mips/configs/ci20_defconfig
+++ b/arch/mips/configs/ci20_defconfig
@@@ -23,15 -25,12 +23,14 @@@ CONFIG_MACH_INGENIC_SOC=
  CONFIG_JZ4780_CI20=y
  CONFIG_HIGHMEM=y
  CONFIG_HZ_100=y
 -# CONFIG_SECCOMP is not set
  # CONFIG_SUSPEND is not set
 +# CONFIG_SECCOMP is not set
  CONFIG_MODULES=y
  # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
- CONFIG_SLAB=y
 +# CONFIG_COMPAT_BRK is not set
  # CONFIG_COMPACTION is not set
  CONFIG_CMA=y
 +# CONFIG_VM_EVENT_COUNTERS is not set
  CONFIG_NET=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y

Attachment: pgpaU0b9wUPE0.pgp
Description: OpenPGP digital signature