All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Borkmann <daniel@iogearbox.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Alexei Starovoitov <ast@kernel.org>,
	Networking <netdev@vger.kernel.org>,
	David Miller <davem@davemloft.net>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Anders Roxell <anders.roxell@linaro.org>
Subject: Re: linux-next: manual merge of the bpf-next tree with the net-next tree
Date: Thu, 26 Apr 2018 09:56:21 +0200	[thread overview]
Message-ID: <946a88a7-a12b-ab57-9f6a-17cf4f9aecfb@iogearbox.net> (raw)
In-Reply-To: <20180426104902.548c3fdb@canb.auug.org.au>

On 04/26/2018 02:49 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the bpf-next tree got a conflict in:
> 
>   tools/testing/selftests/bpf/.gitignore
> 
> between commit:
> 
>   0abf854d7cbb ("selftests: bpf: update .gitignore with missing generated files")
> 
> from the net-next tree and commit:
> 
>   b6fd9cf796e6 ("selftests: bpf: update .gitignore with missing file")
> 
> from the bpf-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Looks good, thanks!

  reply	other threads:[~2018-04-26  7:56 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-26  0:49 linux-next: manual merge of the bpf-next tree with the net-next tree Stephen Rothwell
2018-04-26  7:56 ` Daniel Borkmann [this message]
2018-11-21 23:36 Stephen Rothwell
2019-07-01  4:47 Stephen Rothwell
2019-11-24 23:58 Stephen Rothwell
2019-11-25  1:19 ` Alexei Starovoitov
2020-07-21  2:12 Stephen Rothwell
2020-07-21  2:16 Stephen Rothwell
2020-07-21  8:53 ` Lorenzo Bianconi
2020-08-03  3:05 Stephen Rothwell
2021-01-25  0:12 Stephen Rothwell
2021-01-25 16:09 ` Stanislav Fomichev
2021-01-25 18:03 ` Arjun Roy
2021-02-14 21:12 ` Stephen Rothwell
2021-02-14 21:40   ` Arjun Roy
2021-02-14 23:00     ` Stephen Rothwell
2022-05-11  1:10 Stephen Rothwell
2023-02-06 23:19 Stephen Rothwell
2023-02-19 23:00 Stephen Rothwell
2023-02-20 11:53 ` Alexander Lobakin
2023-03-19 23:09 Stephen Rothwell
2023-03-20  3:17 ` Bagas Sanjaya
2023-04-13 16:12 broonie
2023-04-13 16:31 ` Christian Ehrig
2023-11-30 22:47 Stephen Rothwell
2023-12-14 23:56 Stephen Rothwell
2023-12-17 23:29 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=946a88a7-a12b-ab57-9f6a-17cf4f9aecfb@iogearbox.net \
    --to=daniel@iogearbox.net \
    --cc=anders.roxell@linaro.org \
    --cc=ast@kernel.org \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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.