All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jkosina@suse.cz>,
	Martin Schwidefsky <schwidefsky@de.ibm.com>,
	Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jiri Slaby <jslaby@suse.cz>
Subject: linux-next: manual merge of the livepatching tree with the s390 tree
Date: Fri, 27 Mar 2015 18:30:35 +1100	[thread overview]
Message-ID: <20150327183035.29e1bcec@canb.auug.org.au> (raw)

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

Hi Jiri,

Today's linux-next merge of the livepatching tree got a conflict in
arch/s390/Kconfig between commit 5a79859ae0f3 ("s390: remove 31 bit
support") from the s390 tree and commit b8887ad66c1c ("livepatch: add
support on s390") from the livepatching tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/s390/Kconfig
index 1de26e1c48ac,eba9c1d0dab5..000000000000
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -132,7 -132,8 +132,8 @@@ config S39
  	select HAVE_KERNEL_XZ
  	select HAVE_KPROBES
  	select HAVE_KRETPROBES
 -	select HAVE_KVM if 64BIT
 +	select HAVE_KVM
+ 	select HAVE_LIVEPATCH
  	select HAVE_MEMBLOCK
  	select HAVE_MEMBLOCK_NODE_MAP
  	select HAVE_MEMBLOCK_PHYS_MAP

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

             reply	other threads:[~2015-03-27  7:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-27  7:30 Stephen Rothwell [this message]
2017-03-23  3:27 linux-next: manual merge of the livepatching tree with the s390 tree Stephen Rothwell

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=20150327183035.29e1bcec@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=heiko.carstens@de.ibm.com \
    --cc=jkosina@suse.cz \
    --cc=jslaby@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=schwidefsky@de.ibm.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.