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

Path	csiph.com!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From	Geert Uytterhoeven <geert@linux-m68k.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the kbuild tree with Linus' tree
Date	Thu, 02 Jul 2015 11:20:03 +0200
Message-ID	<pHIP1-Na-25@gated-at.bofh.it> (permalink)
References	<pHAHL-3UX-5@gated-at.bofh.it> <pHGtP-7Fm-7@gated-at.bofh.it> <pHGWS-84M-17@gated-at.bofh.it>
X-Original-To	Michal Marek <mmarek@suse.cz>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=kCxIAorcwPswNFGvV/cfyH8Xme7petFb2tzE586c4UQ=; b=v6txx+vRFACAfAmDyU17BKbKf5CPnyDfzTf38WC/35II9DKTEc7V8G33ydM+0TvUV6 WwRgzj4JIP6nAiSgbJ9fWBy13Dp+0NC+SNjGyP/5hLsFSwFrmxRAF7nde69KC4F7UqzS IpOZy9ZPz8PoZHUVQeHsyRLQVd7AyRIXInklpQZv0SiZj8DWH1/H87inlHsb5kvRTyC+ G9/UPYNqvTkY9Wzp89GpSf5TD2afwslvht76Wsg/IVCqnV2TNv8Mc+jbe+4tDRPBDxZW I3MGBmYy7R91W05aeZ6OG/AhqW5oDExG4ue5kLjtZUSAMgI1JlVtXK5yJcxky7+lDTrI 7O9g==
MIME-Version	1.0
X-Received	by 10.202.72.4 with SMTP id v4mr26300970oia.82.1435828698845; Thu, 02 Jul 2015 02:18:18 -0700 (PDT)
X-Google-Sender-Auth	BjCmAdochPVT6B0IWZDuUPa00Ho
Content-Type	text/plain; charset=UTF-8
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	64
Organization	linux.* mail to news gateway
X-Original-Cc	Stephen Rothwell <sfr@canb.auug.org.au>, Linux-Next <linux-next@vger.kernel.org>, "linux-kernel@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 11:18:18 +0200
X-Original-Message-ID	<CAMuHMdW7bn+jCRaL0xWG7WrVLmOsdmRgYj5F4r73vi2q3pL-Cg@mail.gmail.com>
X-Original-References	<20150702103025.634ca1e5@canb.auug.org.au> <CAMuHMdUCu7MWiUGW+TmVN8=T8SvPHgUoupSdf9XMn0e1mKQm3Q@mail.gmail.com> <5594E56E.7080605@suse.cz>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	aioe.org linux.kernel:1175858

Show key headers only | View raw

On Thu, Jul 2, 2015 at 9:17 AM, Michal Marek <mmarek@suse.cz> wrote:
> Dne 2.7.2015 v 08:47 Geert Uytterhoeven napsal(a):
>> On Thu, Jul 2, 2015 at 2:30 AM, Stephen Rothwell <sfr@canb.auug.org.au> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous 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