Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757453Ab3ENNjN (ORCPT ); Tue, 14 May 2013 09:39:13 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:39119 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755614Ab3ENNjM (ORCPT ); Tue, 14 May 2013 09:39:12 -0400 Date: Tue, 14 May 2013 14:39:07 +0100 From: Luis Henriques To: "'Lars Ellenberg'" Cc: Jonghwan Choi , linux-kernel@vger.kernel.org, stable@vger.kernel.org, "'Philipp Reisner'" Subject: Re: [PATCH 3.9-stable] drbd: Fix build error when CONFIG_CRYPTO_HMAC is not set Message-ID: <20130514133907.GI5196@hercules> References: <003701ce4c40$a44a3e30$ecdeba90$%choi@samsung.com> <20130514125640.GF5196@hercules> <20130514132227.GG21623@soda.linbit> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130514132227.GG21623@soda.linbit> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2376 Lines: 74 On Tue, May 14, 2013 at 03:22:27PM +0200, 'Lars Ellenberg' wrote: > On Tue, May 14, 2013 at 01:56:40PM +0100, Luis Henriques wrote: > > On Thu, May 09, 2013 at 08:06:15AM +0900, Jonghwan Choi wrote: > > > This patch looks like it should be in the 3.9-stable tree, should we apply > > > it? > > > > This seems to be applicable to older kernels as well (starting with > > 3.0 at least). > > > > I'm queuing it for 3.5. > > Uhm no? > There is no struct drbd_tconn and no conn_err before 3.8. Yeah, I've realised that too late. Sorry for the noise, and thanks for catching that. Cheers, -- Luis > > So yes, if you want to queue that for 3.8.y, do so. Before that > this commit is not applicable. > > Lars > > > > > Cheers, > > -- > > Luis > > > > > > > > > > ------------------ > > > > > > From: "Philipp Reisner " > > > > > > commit ef57f9e6bb9278720c8a5278728f252ab85d7ac6 upstream > > > > > > Signed-off-by: Philipp Reisner > > > Signed-off-by: Lars Ellenberg > > > Signed-off-by: Jens Axboe > > > Signed-off-by: Jonghwan Choi > > > --- > > > drivers/block/drbd/drbd_receiver.c | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/block/drbd/drbd_receiver.c > > > b/drivers/block/drbd/drbd_receiver.c > > > index 5105f43..2f5fffd 100644 > > > --- a/drivers/block/drbd/drbd_receiver.c > > > +++ b/drivers/block/drbd/drbd_receiver.c > > > @@ -4658,8 +4658,8 @@ static int drbd_do_features(struct drbd_tconn *tconn) > > > #if !defined(CONFIG_CRYPTO_HMAC) && !defined(CONFIG_CRYPTO_HMAC_MODULE) > > > static int drbd_do_auth(struct drbd_tconn *tconn) > > > { > > > - dev_err(DEV, "This kernel was build without CONFIG_CRYPTO_HMAC.\n"); > > > - dev_err(DEV, "You need to disable 'cram-hmac-alg' in drbd.conf.\n"); > > > + conn_err(tconn, "This kernel was build without > > > CONFIG_CRYPTO_HMAC.\n"); > > > + conn_err(tconn, "You need to disable 'cram-hmac-alg' in > > > drbd.conf.\n"); > > > return -1; > > > } > > > #else > > > -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/