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>,
	David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Daniel Borkmann <daniel@iogearbox.net>,
	Alexei Starovoitov <ast@plumgrid.com>
Subject: linux-next: manual merge of the tip tree with the net-next tree
Date: Tue, 7 Apr 2015 17:00:56 +1000	[thread overview]
Message-ID: <20150407170056.2d89261e@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
include/linux/bpf.h between commit 0fc174dea545 ("ebpf: make internal
bpf API independent of CONFIG_BPF_SYSCALL ifdefs") from the net-next
tree and commit 4e537f7fbdce ("bpf: Make internal bpf API independent
of CONFIG_BPF_SYSCALL #ifdefs") from the tip tree.

I fixed it up (they are the same patch and there are other changes in
the net-next tree, so I just used that version) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 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,
	Daniel Borkmann <daniel@iogearbox.net>,
	Alexei Starovoitov <ast@plumgrid.com>
Subject: linux-next: manual merge of the tip tree with the net-next tree
Date: Tue, 7 Apr 2015 17:00:56 +1000	[thread overview]
Message-ID: <20150407170056.2d89261e@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
include/linux/bpf.h between commit 0fc174dea545 ("ebpf: make internal
bpf API independent of CONFIG_BPF_SYSCALL ifdefs") from the net-next
tree and commit 4e537f7fbdce ("bpf: Make internal bpf API independent
of CONFIG_BPF_SYSCALL #ifdefs") from the tip tree.

I fixed it up (they are the same patch and there are other changes in
the net-next tree, so I just used that version) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

             reply	other threads:[~2015-04-07  7:01 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-07  7:00 Stephen Rothwell [this message]
2015-04-07  7:00 ` linux-next: manual merge of the tip tree with the net-next tree Stephen Rothwell
2015-04-07  7:30 ` Daniel Borkmann
  -- strict thread matches above, loose matches on Subject: below --
2022-03-15  2:13 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
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
2014-01-13  3:18 Stephen Rothwell
2014-01-13  3:18 ` 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
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=20150407170056.2d89261e@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=ast@plumgrid.com \
    --cc=daniel@iogearbox.net \
    --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: 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.