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

Path	csiph.com!aioe.org!goblin3!goblin1!goblin.stu.neva.ru!news.panservice.it!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the kbuild tree with Linus' tree
Date	Thu, 02 Jul 2015 02:40:01 +0200
Message-ID	<pHAHL-3UX-5@gated-at.bofh.it> (permalink)
X-Original-To	Michal Marek <mmarek@suse.cz>
X-Mailer	Claws Mail 3.11.1 (GTK+ 2.24.28; i586-pc-linux-gnu)
MIME-Version	1.0
Content-Type	multipart/signed; micalg=pgp-sha256; boundary="Sig_/S4x/b66IZ4nw1AO9K0g2J=J"; protocol="application/pgp-signature"
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	79
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" <mcgrof@suse.com>, David Vrabel <david.vrabel@citrix.com>, Geert Uytterhoeven <geert+renesas@glider.be>
X-Original-Date	Thu, 2 Jul 2015 10:30:25 +1000
X-Original-Message-ID	<20150702103025.634ca1e5@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	aioe.org linux.kernel:1175629

Show key headers only | View raw

[Multipart message — attachments visible in raw view] - view raw

Hi Michal,

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

  scripts/kconfig/Makefile

between commits:

  9bcd776d299e ("kconfig: clarify kvmconfig is for kvm")
  6c6685055a28 ("kconfig: add xenconfig defconfig helper")

from Linus' tree and commit:

  fa75a727c019 ("kconfig: Wrap long "make help" text lines")

from the kbuild 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 scripts/kconfig/Makefile
index f52abae0ec5f,930de225d52e..000000000000
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@@ -142,9 -139,9 +143,10 @@@ help
  	@echo  '  alldefconfig    - New config with all symbols set to default'
  	@echo  '  randconfig	  - New config with random answer to all options'
  	@echo  '  listnewconfig   - List new options'
- 	@echo  '  olddefconfig	  - Same as silentoldconfig but sets new symbols to their default value'
+ 	@echo  '  olddefconfig	  - Same as silentoldconfig but sets new symbols to their'
+ 	@echo  '                    default value'
 -	@echo  '  kvmconfig	  - Enable additional options for guest kernel support'
 +	@echo  '  kvmconfig	  - Enable additional options for kvm guest kernel support'
 +	@echo  '  xenconfig       - Enable additional options for xen dom0 and guest kernel support'
  	@echo  '  tinyconfig	  - Configure the tiniest possible kernel'
  
  # lxdialog stuff

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the kbuild tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-07-02 02:40 +0200
  Re: linux-next: manual merge of the kbuild tree with Linus' tree Geert Uytterhoeven <geert@linux-m68k.org> - 2015-07-02 11:20 +0200

csiph-web