mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* linux-next: manual merge of the crypto tree with the mips tree
@ 2026-11-18 14:42 Mark Brown
  0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2026-11-18 14:42 UTC (permalink / raw)
  To: Herbert Xu, Linux Crypto List
  Cc: Eric Biggers, Imre Kaloz, Linux Kernel Mailing List,
	Linux Next Mailing List, Thomas Bogendoerfer

[-- Attachment #1: Type: text/plain, Size: 3248 bytes --]

Hi all,

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

  arch/mips/configs/ip32_defconfig

between commit:

  22df49ef5a332 ("MIPS: ip32_defconfig: drop dead options and add-in drivers, add audio")

from the mips tree and commit:

  fd29be9b99251 ("crypto: arc4 - Remove obsolete crypto API support for ARC4")

from the crypto 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.

diff --combined arch/mips/configs/ip32_defconfig
index e43a6a1913e08,0c3bae4a7bac4..0000000000000
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@@ -9,9 -9,10 +9,9 @@@ CONFIG_RELAY=
  CONFIG_EXPERT=y
  CONFIG_PROFILING=y
  CONFIG_SGI_IP32=y
 -# CONFIG_SECCOMP is not set
 -CONFIG_PCI=y
  CONFIG_MIPS32_O32=y
  CONFIG_MIPS32_N32=y
 +# CONFIG_SECCOMP is not set
  CONFIG_MODULES=y
  CONFIG_MODULE_UNLOAD=y
  CONFIG_PARTITION_ADVANCED=y
@@@ -39,10 -40,10 +39,10 @@@ CONFIG_INET6_ESP=
  CONFIG_INET6_IPCOMP=m
  CONFIG_IPV6_TUNNEL=m
  CONFIG_NETWORK_SECMARK=y
 +CONFIG_PCI=y
  CONFIG_CONNECTOR=y
  CONFIG_BLK_DEV_LOOP=m
  CONFIG_BLK_DEV_NBD=m
 -CONFIG_RAID_ATTRS=y
  CONFIG_SCSI=y
  CONFIG_BLK_DEV_SD=y
  CONFIG_BLK_DEV_SR=y
@@@ -50,11 -51,16 +50,11 @@@ CONFIG_CHR_DEV_SG=
  CONFIG_SCSI_CONSTANTS=y
  CONFIG_SCSI_LOGGING=y
  CONFIG_SCSI_SCAN_ASYNC=y
 -CONFIG_SCSI_SAS_LIBSAS=y
  CONFIG_SCSI_AIC7XXX=y
  CONFIG_AIC7XXX_RESET_DELAY_MS=15000
  CONFIG_NETDEVICES=y
  CONFIG_BONDING=m
  CONFIG_DUMMY=m
 -CONFIG_NET_TULIP=y
 -CONFIG_DE2104X=m
 -CONFIG_TULIP=m
 -CONFIG_TULIP_MMIO=y
  CONFIG_SGI_O2MACE_ETH=y
  CONFIG_INPUT_EVDEV=m
  CONFIG_SERIO_MACEPS2=y
@@@ -66,12 -72,12 +66,12 @@@ CONFIG_HW_RANDOM=
  CONFIG_WATCHDOG=y
  CONFIG_FB=y
  CONFIG_FB_GBE=y
 -# CONFIG_VGA_CONSOLE is not set
  CONFIG_FRAMEBUFFER_CONSOLE=y
  CONFIG_LOGO=y
 -# CONFIG_LOGO_LINUX_MONO is not set
 -# CONFIG_LOGO_LINUX_VGA16 is not set
  # CONFIG_LOGO_LINUX_CLUT224 is not set
 +CONFIG_SOUND=m
 +CONFIG_SND=m
 +CONFIG_SND_SGI_O2=m
  # CONFIG_USB_SUPPORT is not set
  CONFIG_RTC_CLASS=y
  # CONFIG_RTC_HCTOSYS is not set
@@@ -143,17 -149,28 +143,17 @@@ CONFIG_NLS_ISO8859_15=
  CONFIG_NLS_KOI8_R=m
  CONFIG_NLS_KOI8_U=m
  CONFIG_NLS_UTF8=m
 -CONFIG_KEYS=y
  CONFIG_CRYPTO_NULL=y
 -CONFIG_CRYPTO_CBC=y
 -CONFIG_CRYPTO_ECB=y
 -CONFIG_CRYPTO_LRW=y
 -CONFIG_CRYPTO_HMAC=y
 -CONFIG_CRYPTO_XCBC=y
 -CONFIG_CRYPTO_MD4=y
 -CONFIG_CRYPTO_SHA1=y
 -CONFIG_CRYPTO_SHA256=y
 -CONFIG_CRYPTO_SHA512=y
 -CONFIG_CRYPTO_WP512=y
 -CONFIG_CRYPTO_ANUBIS=y
  CONFIG_CRYPTO_BLOWFISH=y
 -CONFIG_CRYPTO_CAMELLIA=y
  CONFIG_CRYPTO_CAST5=y
  CONFIG_CRYPTO_CAST6=y
  CONFIG_CRYPTO_DES=y
 -CONFIG_CRYPTO_KHAZAD=y
  CONFIG_CRYPTO_SERPENT=y
 -CONFIG_CRYPTO_TEA=y
  CONFIG_CRYPTO_TWOFISH=y
 +CONFIG_CRYPTO_LRW=y
 +CONFIG_CRYPTO_MD4=y
 +CONFIG_CRYPTO_WP512=y
 +CONFIG_CRYPTO_XCBC=y
  CONFIG_CRYPTO_DEFLATE=y
  CONFIG_FONTS=y
  CONFIG_FONT_8x8=y

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-18 14:42 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-18 14:42 linux-next: manual merge of the crypto tree with the mips tree Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®