From: David Howells <dhowells@redhat•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: dhowells@redhat•com, Herbert Xu <herbert@gondor•apana.org.au>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the crypto tree with the net-next tree
Date: Mon, 07 Mar 2016 11:08:25 +0000 [thread overview]
Message-ID: <28626.1457348905@warthog.procyon.org.uk> (raw)
In-Reply-To: <20160307131834.70da82d4@canb.auug.org.au>
Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Today's linux-next merge of the crypto tree got a conflict in:
>
> net/rxrpc/rxkad.c
>
> between commit:
>
> 0d12f8a4027d ("rxrpc: Keep the skb private record of the Rx header in host byte order")
>
> from the net-next tree and commit:
>
> 1afe593b4239 ("rxrpc: Use skcipher")
>
> from the crypto tree.
What's the best way to deal with this? Should I take Herbert's
[PATCH 18/26] rxrpc: Use skcipher
patch into my rxrpc tree also and pass it on to Dave?
David
next prev parent reply other threads:[~2016-03-07 11:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-07 2:18 linux-next: manual merge of the crypto tree with the net-next tree Stephen Rothwell
2016-03-07 11:08 ` David Howells [this message]
2016-03-08 5:56 ` Stephen Rothwell
2016-03-08 16:48 ` David Howells
2016-03-08 21:22 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-03-30 0:42 Stephen Rothwell
2020-03-30 0:49 ` Herbert Xu
2020-03-30 15:35 ` Ayush Sawal
2018-07-30 3:22 Stephen Rothwell
2018-07-31 6:24 ` Krzysztof Kozlowski
2018-08-15 3:12 ` Stephen Rothwell
2018-01-25 10:52 Stephen Rothwell
2013-02-06 2:20 Stephen Rothwell
2013-02-06 5:45 ` Herbert Xu
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=28626.1457348905@warthog.procyon.org.uk \
--to=dhowells@redhat$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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