All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Amerigo Wang <amwang@redhat.com>, Michal Marek <mmarek@suse.cz>
Subject: linux-next: manual merge of the tip tree with the kbuild tree
Date: Thu, 1 Jul 2010 14:05:26 +1000	[thread overview]
Message-ID: <20100701140526.1f20f906.sfr@canb.auug.org.au> (raw)

Hi all,

Today's linux-next merge of the tip tree got a conflict in Makefile
between commit 01ab17887f4cdcb8bb5a5d1bc3b160d186e6e99b ("Makefile: "make
kernelrelease" should show the correct full kernel version") from the
kbuild tree and commit 8e5564e6c7554902301543e731354ad2ad58ae53 ("perf
tools: Make target to generate self contained source tarball") from the
tip tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc Makefile
index c0581a9,f6c206a..0000000
--- a/Makefile
+++ b/Makefile
@@@ -412,9 -412,9 +412,9 @@@ endi
  # of make so .config is not included in this case either (for *config).
  
  no-dot-config-targets := clean mrproper distclean \
 -			 cscope TAGS tags help %docs check% \
 +			 cscope TAGS tags help %docs check% coccicheck \
  			 include/linux/version.h headers_% \
- 			 kernelversion
 -			 kernelrelease kernelversion %src-pkg
++			 kernelversion %src-pkg
  
  config-targets := 0
  mixed-targets  := 0

             reply	other threads:[~2010-07-01  4:05 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-01  4:05 Stephen Rothwell [this message]
2011-05-20  3:36 linux-next: manual merge of the tip tree with the kbuild tree Stephen Rothwell
2011-05-20  3:54 ` Steven Rostedt
2012-05-07  5:10 Stephen Rothwell
2012-05-07 19:25 ` Michal Marek
2012-05-07 20:24 ` Sam Ravnborg
2013-02-18  3:35 Stephen Rothwell
2013-02-18  6:31 ` H. Peter Anvin
2016-09-06  3:43 Stephen Rothwell
2017-06-23  3:50 Stephen Rothwell
2017-07-03  1:08 ` Stephen Rothwell
2018-08-06  4:47 Stephen Rothwell
2018-08-14 23:26 ` Stephen Rothwell
2018-12-20  4:57 Stephen Rothwell
2019-02-26  2:48 Stephen Rothwell
2020-09-25  5:25 Stephen Rothwell
2020-10-15  1:57 ` Stephen Rothwell
2022-05-23  4:24 Stephen Rothwell
2022-05-23  5:37 ` Masahiro Yamada
2022-05-23  5:46   ` Stephen Rothwell
2022-05-23  5:47 ` Stephen Rothwell
2022-05-23 16:23   ` Josh Poimboeuf
2022-05-27  2:19     ` Masahiro Yamada
2022-05-27  4:47       ` Josh Poimboeuf
2022-05-27  6:04         ` Masahiro Yamada
2022-05-27 12:18           ` Masahiro Yamada
2022-05-27 14:59           ` Josh Poimboeuf
2024-05-17  1:30 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=20100701140526.1f20f906.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=amwang@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mmarek@suse.cz \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.