linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Randy Dunlap <rdunlap@xenotime.net>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Javi Merino <javi.merino@arm.com>, Michal Marek <mmarek@suse.cz>
Subject: [PATCH 2/8] Documentation: mention scripts/diffconfig tool
Date: Fri, 30 Mar 2012 13:37:02 -0700	[thread overview]
Message-ID: <4F76196E.6010707@xenotime.net> (raw)
In-Reply-To: <4F761580.3020807@xenotime.net>

From:	"Javi Merino" <javi.merino@arm.com>

Documentation: Mention scripts/diffconfig as a tool to compare config files

The kconfig documentation suggests using plain 'diff' to compare
config files and then adds "Yes, we need something better here".
"a717417 kconfig: add diffconfig utility" added what that comment was
looking for.

Signed-off-by: Javi Merino <javi.merino@arm.com>
Cc: Michal Marek <mmarek@suse.cz>
---
 Documentation/kbuild/kconfig.txt |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

--- lnx-33.orig/Documentation/kbuild/kconfig.txt
+++ lnx-33/Documentation/kbuild/kconfig.txt
@@ -28,12 +28,10 @@ new (default) values, so you can use:
 
 	grep "(NEW)" conf.new
 
-to see the new config symbols or you can 'diff' the previous and
-new .config files to see the differences:
+to see the new config symbols or you can use diffconfig to see the
+differences between the previous and new .config files:
 
-	diff .config.old .config | less
-
-(Yes, we need something better here.)
+	scripts/diffconfig .config.old .config | less
 
 ______________________________________________________________________
 Environment variables for '*config'

       reply	other threads:[~2012-03-30 20:37 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <4F761580.3020807@xenotime.net>
2012-03-30 20:37 ` Randy Dunlap [this message]
2012-03-30 20:37 ` [PATCH 3/8] Documentation: sysrq: Crutcher Dunnavant is unavailable Randy Dunlap
2012-03-30 23:01   ` Linus Torvalds
2012-03-30 20:37 ` [PATCH 4/8] Documentation: CodingStyle: add inline assembly guidelines Randy Dunlap
2012-03-30 20:37 ` [PATCH 5/8] Documentation: input.txt: clarify mousedev 'cat' command syntax Randy Dunlap
2012-03-30 20:37 ` [PATCH 6/8] Documentation: remove references to /etc/modprobe.conf Randy Dunlap
2012-03-30 20:37 ` [PATCH 7/8] Documentation: replace install commands with softdeps Randy Dunlap
2012-03-30 20:37 ` [PATCH 8/8] Documentation: fix typo in ABI/stable/sysfs-driver-usb-usbtmc Randy Dunlap

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=4F76196E.6010707@xenotime.net \
    --to=rdunlap@xenotime.net \
    --cc=javi.merino@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mmarek@suse.cz \
    --cc=torvalds@linux-foundation.org \
    /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).