From: Marcelo Ricardo Leitner <mleitner@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Steven Rostedt (Red Hat)" <rostedt@goodmis.org>,
Pablo Neira Ayuso <pablo@netfilter.org>
Subject: Re: linux-next: manual merge of the net-next tree with the vfs tree
Date: Tue, 25 Nov 2014 09:23:52 -0200 [thread overview]
Message-ID: <547466C8.1000203@redhat.com> (raw)
In-Reply-To: <20141125134246.2761ada5@canb.auug.org.au>
On 25-11-2014 00:42, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> net/netfilter/nf_log.c between commit e71456ae9871 ("netfilter: Remove
> checks of seq_printf() return values") from the vfs tree and commit
> 0c26ed1c07f1 ("netfilter: nf_log: Introduce nft_log_dereference()
> macro") from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
Looks good to me, thanks Stephen.
Marcelo
next prev parent reply other threads:[~2014-11-25 11:23 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-25 2:42 linux-next: manual merge of the net-next tree with the vfs tree Stephen Rothwell
2014-11-25 2:42 ` Stephen Rothwell
2014-11-25 11:23 ` Marcelo Ricardo Leitner [this message]
2014-11-25 15:56 ` Pablo Neira Ayuso
-- strict thread matches above, loose matches on Subject: below --
2018-05-17 1:34 Stephen Rothwell
2018-05-17 6:47 ` Christoph Hellwig
2018-01-25 6:41 Stephen Rothwell
2018-01-09 23:34 Stephen Rothwell
2017-12-08 0:33 Stephen Rothwell
2017-04-07 0:22 Stephen Rothwell
2015-03-30 3:24 Stephen Rothwell
2015-03-30 3:24 ` Stephen Rothwell
2015-03-30 3:08 Stephen Rothwell
2015-03-30 3:08 ` Stephen Rothwell
2015-03-13 2:15 Stephen Rothwell
2015-03-13 2:15 ` Stephen Rothwell
2015-03-13 3:24 ` David Miller
2015-03-13 3:56 ` Al Viro
2015-03-13 4:38 ` Stephen Rothwell
2015-03-13 16:37 ` Al Viro
2015-03-14 0:43 ` Al Viro
2015-03-13 4:52 ` David Miller
2012-09-05 2:02 Stephen Rothwell
2012-09-05 2:02 ` Stephen Rothwell
2012-09-05 4:55 ` Masatake YAMATO
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=547466C8.1000203@redhat.com \
--to=mleitner@redhat.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=rostedt@goodmis.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@ZenIV.linux.org.uk \
/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.