Linux-Next discussions
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Herbert Xu <herbert@gondor.apana.org.au>,
	Linux Crypto List <linux-crypto@vger.kernel.org>
Cc: Eric Biggers <ebiggers@kernel.org>, Imre Kaloz <kaloz@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Subject: linux-next: manual merge of the crypto tree with the mips tree
Date: Wed, 18 Nov 2026 14:42:11 +0000	[thread overview]
Message-ID: <av25Q7bdayobYN_G@sirena.org.uk> (raw)

[-- 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 --]

                 reply	other threads:[~2026-11-18 14:42 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=av25Q7bdayobYN_G@sirena.org.uk \
    --to=broonie@kernel.org \
    --cc=ebiggers@kernel.org \
    --cc=herbert@gondor.apana.org.au \
    --cc=kaloz@kernel.org \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=tsbogend@alpha.franken.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox