From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Oleg Drokin <green@linuxhacker.ru>
Subject: Re: linux-next: manual merge of the staging tree with the crypto tree
Date: Mon, 22 Feb 2016 17:36:36 -0800 [thread overview]
Message-ID: <20160223013636.GB761@kroah.com> (raw)
In-Reply-To: <20160222145525.3d32f803@canb.auug.org.au>
On Mon, Feb 22, 2016 at 02:55:25PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
>
> between commit:
>
> 6dae10001e84 ("staging: lustre: Use ahash")
>
> from the crypto tree and commit:
>
> 15d9f5201fc3 ("staging/lustre/libcfs: Adjust NULL comparison codestyle")
> 3e1f3db1b29b ("staging/lustre: Remove space after cast in cfs_crypto_hash_final()")
>
> from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2016-02-23 1:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-22 3:55 linux-next: manual merge of the staging tree with the crypto tree Stephen Rothwell
2016-02-23 1:36 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-03-15 6:58 Stephen Rothwell
2018-03-15 10:18 ` Greg KH
2018-07-09 4:15 Stephen Rothwell
2018-08-15 23:49 ` Stephen Rothwell
2020-09-18 5:21 Stephen Rothwell
2020-09-18 5:41 ` Herbert Xu
2020-09-18 7:49 ` Greg KH
2020-09-18 7:50 ` Herbert Xu
2020-09-18 8:05 ` Greg KH
2020-09-20 14:01 ` Greg KH
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=20160223013636.GB761@kroah.com \
--to=greg@kroah.com \
--cc=green@linuxhacker.ru \
--cc=herbert@gondor.apana.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox