From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Insu Yun <wuninsu@gmail.com>
Subject: linux-next: manual merge of the crypto tree with the net tree
Date: Fri, 19 Feb 2016 10:49:57 +1100 [thread overview]
Message-ID: <20160219104957.0273c75a@canb.auug.org.au> (raw)
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in:
net/ipv4/tcp.c
between commit:
1eea84b74cd2 ("tcp: correctly crypto_alloc_hash return check")
from the net tree and commit:
cf80e0e47e0e ("tcp: Use ahash")
from the crypto tree.
I fixed it up (the latter removed the code fixed by the former) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-02-18 23:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-18 23:49 Stephen Rothwell [this message]
2016-02-20 8:44 ` linux-next: manual merge of the crypto tree with the net tree 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=20160219104957.0273c75a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=herbert@gondor.apana.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=wuninsu@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).