From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>,
netdev@vger•kernel.org, Ralf Baechle <ralf@linux-mips•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Hannes Frederic Sowa <hannes@stressinduktion•org>,
Andrey Utkin <andrey.krieger.utkin@gmail•com>
Subject: linux-next: manual merge of the net-next tree with the mips tree
Date: Mon, 15 Sep 2014 13:19:01 +1000 [thread overview]
Message-ID: <20140915131901.0f3c8a09@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 570 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
arch/mips/net/bpf_jit.c between commit 98fb24af5e68
("arch/mips/net/bpf_jit.c: fix failure check") from the mips tree and
commit 233577a22089 ("net: filter: constify detection of
pkt_type_offset") from the net-next tree.
I fixed it up (the latter removed the code fixed up by the former, so I
effectively reverted the former and just used the latter) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-09-15 3:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-15 3:19 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-01-15 2:24 linux-next: manual merge of the net-next tree with the mips tree Stephen Rothwell
2013-02-21 2:01 Stephen Rothwell
2013-01-24 1: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=20140915131901.0f3c8a09@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andrey.krieger.utkin@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=hannes@stressinduktion$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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