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>, David Miller <davem@davemloft.net>, <netdev@vger.kernel.org> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the tip tree with the net-next tree Date: Mon, 13 Jan 2014 14:18:24 +1100 [thread overview] Message-ID: <20140113141824.4301cb76e8e5540d42d74015@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 4196 bytes --] Hi all, Today's linux-next merge of the tip tree got conflicts in arch/arc/include/asm/Kbuild, arch/cris/include/asm/Kbuild, arch/hexagon/include/asm/Kbuild, arch/microblaze/include/asm/Kbuild, arch/parisc/include/asm/Kbuild and arch/score/include/asm/Kbuild between commit e3fec2f74f7f ("lib: Add missing arch generic-y entries for asm-generic/hash.h") from the net-next tree and commit 93ea02bb8435 ("arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h") from the tip tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). BTW: thanks for not keeping the Kbuild files sorted :-( -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/arc/include/asm/Kbuild index 93e6ca919620,e07c786011af..000000000000 --- a/arch/arc/include/asm/Kbuild +++ b/arch/arc/include/asm/Kbuild @@@ -1,4 -1,4 +1,5 @@@ generic-y += auxvec.h ++generic-y += barrier.h generic-y += bugs.h generic-y += bitsperlong.h generic-y += clkdev.h @@@ -11,6 -11,6 +12,7 @@@ generic-y += fcntl. generic-y += fb.h generic-y += ftrace.h generic-y += hardirq.h ++generic-y += hash.h generic-y += hw_irq.h generic-y += ioctl.h generic-y += ioctls.h @@@ -47,4 -47,4 +49,3 @@@ generic-y += user. generic-y += vga.h generic-y += xor.h generic-y += preempt.h - generic-y += hash.h -generic-y += barrier.h diff --cc arch/cris/include/asm/Kbuild index c5963b3e4624,35ec2e5ca832..000000000000 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@@ -3,8 -3,8 +3,10 @@@ header-y += arch-v10 header-y += arch-v32/ ++generic-y += barrier.h generic-y += clkdev.h generic-y += exec.h ++generic-y += hash.h generic-y += kvm_para.h generic-y += linkage.h generic-y += module.h @@@ -12,4 -12,4 +14,3 @@@ generic-y += trace_clock. generic-y += vga.h generic-y += xor.h generic-y += preempt.h - generic-y += hash.h -generic-y += barrier.h diff --cc arch/hexagon/include/asm/Kbuild index 469d223950ff,a614ec9747a6..000000000000 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@@ -2,6 -2,6 +2,7 @@@ header-y += ucontext.h generic-y += auxvec.h ++generic-y += barrier.h generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h @@@ -15,6 -15,6 +16,7 @@@ generic-y += fb. generic-y += fcntl.h generic-y += ftrace.h generic-y += hardirq.h ++generic-y += hash.h generic-y += hw_irq.h generic-y += ioctl.h generic-y += ioctls.h @@@ -54,4 -54,4 +56,3 @@@ generic-y += ucontext. generic-y += unaligned.h generic-y += xor.h generic-y += preempt.h - generic-y += hash.h -generic-y += barrier.h diff --cc arch/microblaze/include/asm/Kbuild index 43eec338ff50,f77fb6630b11..000000000000 --- a/arch/microblaze/include/asm/Kbuild +++ b/arch/microblaze/include/asm/Kbuild @@@ -1,7 -1,7 +1,8 @@@ ++generic-y += barrier.h generic-y += clkdev.h generic-y += exec.h ++generic-y += hash.h generic-y += trace_clock.h generic-y += syscalls.h generic-y += preempt.h - generic-y += hash.h -generic-y += barrier.h diff --cc arch/parisc/include/asm/Kbuild index 75edd5fcc6ff,8df06d0074f4..000000000000 --- a/arch/parisc/include/asm/Kbuild +++ b/arch/parisc/include/asm/Kbuild @@@ -1,8 -1,8 +1,9 @@@ ++generic-y += barrier.h generic-y += word-at-a-time.h auxvec.h user.h cputime.h emergency-restart.h \ segment.h topology.h vga.h device.h percpu.h hw_irq.h mutex.h \ div64.h irq_regs.h kdebug.h kvm_para.h local64.h local.h param.h \ poll.h xor.h clkdev.h exec.h ++generic-y += hash.h generic-y += trace_clock.h generic-y += preempt.h - generic-y += hash.h -generic-y += barrier.h diff --cc arch/score/include/asm/Kbuild index 099e7ba40599,ee2993b6e5d1..000000000000 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@@ -1,9 -1,8 +1,9 @@@ header-y += ++generic-y += barrier.h generic-y += clkdev.h ++generic-y += hash.h generic-y += trace_clock.h generic-y += xor.h generic-y += preempt.h - generic-y += hash.h - -generic-y += barrier.h [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
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>, David Miller <davem@davemloft.net>, netdev@vger.kernel.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the tip tree with the net-next tree Date: Mon, 13 Jan 2014 14:18:24 +1100 [thread overview] Message-ID: <20140113141824.4301cb76e8e5540d42d74015@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 4196 bytes --] Hi all, Today's linux-next merge of the tip tree got conflicts in arch/arc/include/asm/Kbuild, arch/cris/include/asm/Kbuild, arch/hexagon/include/asm/Kbuild, arch/microblaze/include/asm/Kbuild, arch/parisc/include/asm/Kbuild and arch/score/include/asm/Kbuild between commit e3fec2f74f7f ("lib: Add missing arch generic-y entries for asm-generic/hash.h") from the net-next tree and commit 93ea02bb8435 ("arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h") from the tip tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). BTW: thanks for not keeping the Kbuild files sorted :-( -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/arc/include/asm/Kbuild index 93e6ca919620,e07c786011af..000000000000 --- a/arch/arc/include/asm/Kbuild +++ b/arch/arc/include/asm/Kbuild @@@ -1,4 -1,4 +1,5 @@@ generic-y += auxvec.h ++generic-y += barrier.h generic-y += bugs.h generic-y += bitsperlong.h generic-y += clkdev.h @@@ -11,6 -11,6 +12,7 @@@ generic-y += fcntl. generic-y += fb.h generic-y += ftrace.h generic-y += hardirq.h ++generic-y += hash.h generic-y += hw_irq.h generic-y += ioctl.h generic-y += ioctls.h @@@ -47,4 -47,4 +49,3 @@@ generic-y += user. generic-y += vga.h generic-y += xor.h generic-y += preempt.h - generic-y += hash.h -generic-y += barrier.h diff --cc arch/cris/include/asm/Kbuild index c5963b3e4624,35ec2e5ca832..000000000000 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@@ -3,8 -3,8 +3,10 @@@ header-y += arch-v10 header-y += arch-v32/ ++generic-y += barrier.h generic-y += clkdev.h generic-y += exec.h ++generic-y += hash.h generic-y += kvm_para.h generic-y += linkage.h generic-y += module.h @@@ -12,4 -12,4 +14,3 @@@ generic-y += trace_clock. generic-y += vga.h generic-y += xor.h generic-y += preempt.h - generic-y += hash.h -generic-y += barrier.h diff --cc arch/hexagon/include/asm/Kbuild index 469d223950ff,a614ec9747a6..000000000000 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@@ -2,6 -2,6 +2,7 @@@ header-y += ucontext.h generic-y += auxvec.h ++generic-y += barrier.h generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h @@@ -15,6 -15,6 +16,7 @@@ generic-y += fb. generic-y += fcntl.h generic-y += ftrace.h generic-y += hardirq.h ++generic-y += hash.h generic-y += hw_irq.h generic-y += ioctl.h generic-y += ioctls.h @@@ -54,4 -54,4 +56,3 @@@ generic-y += ucontext. generic-y += unaligned.h generic-y += xor.h generic-y += preempt.h - generic-y += hash.h -generic-y += barrier.h diff --cc arch/microblaze/include/asm/Kbuild index 43eec338ff50,f77fb6630b11..000000000000 --- a/arch/microblaze/include/asm/Kbuild +++ b/arch/microblaze/include/asm/Kbuild @@@ -1,7 -1,7 +1,8 @@@ ++generic-y += barrier.h generic-y += clkdev.h generic-y += exec.h ++generic-y += hash.h generic-y += trace_clock.h generic-y += syscalls.h generic-y += preempt.h - generic-y += hash.h -generic-y += barrier.h diff --cc arch/parisc/include/asm/Kbuild index 75edd5fcc6ff,8df06d0074f4..000000000000 --- a/arch/parisc/include/asm/Kbuild +++ b/arch/parisc/include/asm/Kbuild @@@ -1,8 -1,8 +1,9 @@@ ++generic-y += barrier.h generic-y += word-at-a-time.h auxvec.h user.h cputime.h emergency-restart.h \ segment.h topology.h vga.h device.h percpu.h hw_irq.h mutex.h \ div64.h irq_regs.h kdebug.h kvm_para.h local64.h local.h param.h \ poll.h xor.h clkdev.h exec.h ++generic-y += hash.h generic-y += trace_clock.h generic-y += preempt.h - generic-y += hash.h -generic-y += barrier.h diff --cc arch/score/include/asm/Kbuild index 099e7ba40599,ee2993b6e5d1..000000000000 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@@ -1,9 -1,8 +1,9 @@@ header-y += ++generic-y += barrier.h generic-y += clkdev.h ++generic-y += hash.h generic-y += trace_clock.h generic-y += xor.h generic-y += preempt.h - generic-y += hash.h - -generic-y += barrier.h [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-01-13 3:18 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-01-13 3:18 Stephen Rothwell [this message] 2014-01-13 3:18 ` linux-next: manual merge of the tip tree with the net-next tree Stephen Rothwell 2014-01-13 3:20 ` Stephen Rothwell 2014-01-13 3:20 ` Stephen Rothwell 2014-01-14 3:02 ` 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-01-14 6:00 ` [tip:core/locking] arch: Re-sort some Kbuild files to hopefully help avoid some conflicts tip-bot for Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2022-03-15 2:13 linux-next: manual merge of the tip tree with the net-next tree Stephen Rothwell 2022-01-10 1:12 Stephen Rothwell 2019-10-18 2:31 Stephen Rothwell 2019-10-18 5:00 ` Alexei Starovoitov 2019-02-15 2:20 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 2017-11-01 16:27 ` Alexei Starovoitov 2017-11-05 2:12 ` Stephen Rothwell 2017-11-01 7:10 Stephen Rothwell 2017-10-30 20:55 Mark Brown 2017-11-13 6:00 ` Stephen Rothwell 2017-08-31 3:47 Stephen Rothwell 2017-09-05 0:05 ` Stephen Rothwell 2017-02-20 1:22 Stephen Rothwell 2017-02-20 9:02 ` Daniel Borkmann 2016-12-12 2:30 Stephen Rothwell 2016-12-01 3:46 Stephen Rothwell 2016-11-17 3:04 Stephen Rothwell 2015-04-07 7:11 Stephen Rothwell 2015-04-07 7:11 ` Stephen Rothwell 2015-04-07 7:32 ` Daniel Borkmann 2015-04-07 16:10 ` Alexei Starovoitov 2015-04-07 7:04 Stephen Rothwell 2015-04-07 7:04 ` Stephen Rothwell 2015-04-07 16:11 ` Alexei Starovoitov 2015-04-07 7:00 Stephen Rothwell 2015-04-07 7:00 ` Stephen Rothwell 2015-04-07 7:30 ` Daniel Borkmann 2014-07-25 4:38 Stephen Rothwell 2014-07-25 4:38 ` Stephen Rothwell 2014-05-05 4:29 Stephen Rothwell 2014-05-05 4:29 ` Stephen Rothwell 2013-11-08 4:58 Stephen Rothwell 2013-11-08 4:58 ` Stephen Rothwell 2013-04-11 4:03 Stephen Rothwell 2013-04-11 4:03 ` 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=20140113141824.4301cb76e8e5540d42d74015@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=davem@davemloft.net \ --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: linkBe 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.