diff options
| author |   Sean Paul <seanpaul@chromium.org> | 2017-08-14 13:14:36 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-08-14 13:14:36 -0400 |
| commit | 1724c7c0c9494dcbdd7f630f29e1e8427cb231d1 (patch) | |
| tree | d7c7ad032289cdf0633feee4bd6ec5800b666ca7 /crypto/algapi.c | |
| parent | drm/atomic: Handle -EDEADLK with out-fences correctly (diff) | |
| parent | Linux 4.13-rc5 (diff) | |
| download | linux-rng-1724c7c0c9494dcbdd7f630f29e1e8427cb231d1.tar.xz linux-rng-1724c7c0c9494dcbdd7f630f29e1e8427cb231d1.zip | |
Merge origin/master into drm-misc-fixes
Backmerge 4.13-rc5 into drm-misc-fixes, it was getting a
little stale.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'crypto/algapi.c')
| -rw-r--r-- | crypto/algapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c index 9eed4ef9c971..e4cc7615a139 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -260,7 +260,7 @@ void crypto_alg_tested(const char *name, int err) goto found; } - printk(KERN_ERR "alg: Unexpected test result for %s: %d\n", name, err); + pr_err("alg: Unexpected test result for %s: %d\n", name, err); goto unlock; found: |