From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Michal Marek <mmarek@suse.cz>
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>
Subject: Re: linux-next: manual merge of the kbuild tree with Linus' tree
Date: Thu, 2 Jul 2015 11:18:18 +0200 [thread overview]
Message-ID: <CAMuHMdW7bn+jCRaL0xWG7WrVLmOsdmRgYj5F4r73vi2q3pL-Cg@mail.gmail.com> (raw)
In-Reply-To: <5594E56E.7080605@suse.cz>
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
next prev parent reply other threads:[~2015-07-02 9:18 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-02 0:30 linux-next: manual merge of the kbuild tree with Linus' tree Stephen Rothwell
2015-07-02 6:47 ` Geert Uytterhoeven
2015-07-02 7:17 ` Michal Marek
2015-07-02 9:18 ` Geert Uytterhoeven [this message]
2015-07-02 19:53 ` Michal Marek
2015-07-03 11:56 ` Geert Uytterhoeven
2016-07-28 1:50 Stephen Rothwell
2016-09-12 1:32 Stephen Rothwell
2016-09-12 2:53 ` Nicholas Piggin
2016-09-12 9:03 ` Michal Marek
2016-09-12 23:39 ` Stephen Rothwell
2016-09-13 4:02 ` Stephen Rothwell
2016-09-13 4:09 ` Nicholas Piggin
2016-09-13 7:48 ` Arnd Bergmann
2016-09-13 9:12 ` Nicholas Piggin
2017-05-02 22:14 Stephen Rothwell
2019-05-01 22:46 Stephen Rothwell
2020-06-04 22:59 Stephen Rothwell
2021-02-22 22:24 Stephen Rothwell
2021-04-26 23:02 Stephen Rothwell
2022-04-03 22:09 Stephen Rothwell
2022-05-27 0:08 Stephen Rothwell
2022-10-06 18:16 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=CAMuHMdW7bn+jCRaL0xWG7WrVLmOsdmRgYj5F4r73vi2q3pL-Cg@mail.gmail.com \
--to=geert@linux-m68k.org \
--cc=david.vrabel@citrix.com \
--cc=geert+renesas@glider.be \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mcgrof@suse.com \
--cc=mmarek@suse.cz \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).