All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexei Starovoitov <ast@plumgrid.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	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: Re: linux-next: manual merge of the tip tree with the net-next tree
Date: Tue, 07 Apr 2015 09:11:33 -0700	[thread overview]
Message-ID: <552401B5.30303@plumgrid.com> (raw)
In-Reply-To: <20150407170402.1aeae791@canb.auug.org.au>

On 4/7/15 12:04 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> samples/bpf/Makefile between commit 91bc4822c3d6 ("tc: bpf: add
> checksum helpers") from the net-next tree and commit b896c4f95ab4
> ("samples/bpf: Add simple non-portable kprobe filter example") (and
> following) from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>

Looks good. Thanks Stephen.

  reply	other threads:[~2015-04-07 16:11 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-07  7:04 linux-next: manual merge of the tip tree with the net-next tree Stephen Rothwell
2015-04-07  7:04 ` Stephen Rothwell
2015-04-07 16:11 ` Alexei Starovoitov [this message]
  -- 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: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
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=552401B5.30303@plumgrid.com \
    --to=ast@plumgrid.com \
    --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=sfr@canb.auug.org.au \
    --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.