linux-next.vger.kernel.org archive mirror
 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,
	Daniel Borkmann <dborkman@redhat.com>,
	David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org, Borislav Petkov <bp@suse.de>
Subject: linux-next: manual merge of the tip tree with the net-next tree
Date: Thu, 11 Apr 2013 14:03:06 +1000	[thread overview]
Message-ID: <20130411140306.e5c3366fea7ac2f7aadd77ff@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1510 bytes --]

Hi all,

Today's linux-next merge of the tip tree got a conflict in tools/Makefile
between commit e306e2c13b8c ("filter: add minimal BPF JIT image
disassembler") from the net-next tree and commit 85c66be101e1 ("perf
tools: Introduce tools/lib/lk library") from the tip 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 tools/Makefile
index c73c635,6aaeb6c..0000000
--- a/tools/Makefile
+++ b/tools/Makefile
@@@ -35,7 -34,13 +35,13 @@@ help
  cpupower: FORCE
  	$(call descend,power/$@)
  
- cgroup firewire lguest perf usb virtio vm net: FORCE
 -cgroup firewire guest usb virtio vm: FORCE
++cgroup firewire guest usb virtio vm net: FORCE
+ 	$(call descend,$@)
+ 
+ liblk: FORCE
+ 	$(call descend,lib/lk)
+ 
+ perf: liblk FORCE
  	$(call descend,$@)
  
  selftests: FORCE
@@@ -63,7 -68,13 +69,13 @@@ install: cgroup_install cpupower_instal
  cpupower_clean:
  	$(call descend,power/cpupower,clean)
  
- cgroup_clean firewire_clean lguest_clean perf_clean usb_clean virtio_clean vm_clean net_clean:
 -cgroup_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean:
++cgroup_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean net_clean:
+ 	$(call descend,$(@:_clean=),clean)
+ 
+ liblk_clean:
+ 	$(call descend,lib/lk,clean)
+ 
+ perf_clean: liblk_clean
  	$(call descend,$(@:_clean=),clean)
  
  selftests_clean:

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2013-04-11  4:03 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-11  4:03 Stephen Rothwell [this message]
2013-11-08  4:58 linux-next: manual merge of the tip tree with the net-next tree Stephen Rothwell
2014-01-13  3:18 Stephen Rothwell
2014-01-13  3:20 ` Stephen Rothwell
2014-01-14  3:02   ` Stephen Rothwell
2014-01-14  4:51     ` H. Peter Anvin
2014-01-14  5:19       ` Stephen Rothwell
2014-01-14  5:19       ` David Miller
2014-01-14  5:44         ` Stephen Rothwell
2014-01-14  5:48           ` David Miller
2014-01-14  6:10             ` Stephen Rothwell
2014-05-05  4:29 Stephen Rothwell
2014-07-25  4:38 Stephen Rothwell
2015-04-07  7:00 Stephen Rothwell
2015-04-07  7:30 ` Daniel Borkmann
2015-04-07  7:04 Stephen Rothwell
2015-04-07 16:11 ` Alexei Starovoitov
2015-04-07  7:11 Stephen Rothwell
2015-04-07  7:32 ` Daniel Borkmann
2015-04-07 16:10 ` Alexei Starovoitov
2016-11-17  3:04 Stephen Rothwell
2016-12-01  3:46 Stephen Rothwell
2016-12-12  2:30 Stephen Rothwell
2017-02-20  1:22 Stephen Rothwell
2017-02-20  9:02 ` Daniel Borkmann
2017-08-31  3:47 Stephen Rothwell
2017-09-05  0:05 ` Stephen Rothwell
2017-10-30 20:55 Mark Brown
2017-11-13  6:00 ` Stephen Rothwell
2017-11-01  7:10 Stephen Rothwell
2017-11-01  7:15 Stephen Rothwell
2017-11-01  8:18 ` Peter Zijlstra
2017-11-01  8:27   ` Ingo Molnar
2017-11-01  8:55     ` Peter Zijlstra
2017-11-01  9:04       ` Ingo Molnar
2017-11-01 10:57       ` Stephen Rothwell
2019-02-15  2:20 Stephen Rothwell
2019-10-18  2:31 Stephen Rothwell
2019-10-18  5:00 ` Alexei Starovoitov
2022-01-10  1:12 Stephen Rothwell
2022-03-15  2:13 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=20130411140306.e5c3366fea7ac2f7aadd77ff@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=bp@suse.de \
    --cc=davem@davemloft.net \
    --cc=dborkman@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=netdev@vger.kernel.org \
    --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 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).