From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753032AbbGBJSf (ORCPT ); Thu, 2 Jul 2015 05:18:35 -0400 Received: from mail-ob0-f181.google.com ([209.85.214.181]:33084 "EHLO mail-ob0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752479AbbGBJST (ORCPT ); Thu, 2 Jul 2015 05:18:19 -0400 MIME-Version: 1.0 In-Reply-To: <5594E56E.7080605@suse.cz> References: <20150702103025.634ca1e5@canb.auug.org.au> <5594E56E.7080605@suse.cz> Date: Thu, 2 Jul 2015 11:18:18 +0200 X-Google-Sender-Auth: BjCmAdochPVT6B0IWZDuUPa00Ho Message-ID: Subject: Re: linux-next: manual merge of the kbuild tree with Linus' tree From: Geert Uytterhoeven To: Michal Marek Cc: Stephen Rothwell , Linux-Next , "linux-kernel@vger.kernel.org" , "Luis R. Rodriguez" , David Vrabel , Geert Uytterhoeven Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 2, 2015 at 9:17 AM, Michal Marek wrote: > Dne 2.7.2015 v 08:47 Geert Uytterhoeven napsal(a): >> On Thu, Jul 2, 2015 at 2:30 AM, Stephen Rothwell wrote: >>> 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' >> >> Doh, a new long line to be wrapped. >> >> Michal: Shall I send a fix-up patch, or a new one against Linus' tree? > > Please send one against Linus' tree, because I do not have the xenconfig > patch in the kbuild tree. Done. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds