[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20180314150627.GL23100@dhcp22.suse.cz>
Date: Wed, 14 Mar 2018 16:06:27 +0100
From: Michal Hocko <mhocko@...nel.org>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-kernel@...r.kernel.org, rdunlap@...radead.org,
sfr@...b.auug.org.au
Subject: Re: + headers-untangle-kmemleakh-from-mmh-fix.patch added to -mm tree
On Wed 14-03-18 08:03:28, Andrew Morton wrote:
> On Wed, 14 Mar 2018 15:57:24 +0100 Michal Hocko <mhocko@...nel.org> wrote:
>
> > > > 1 file changed, 1 insertion(+)
> > > >
> > > > diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
> > > > index 6f9e4ce568cd..9bb0a7f2863e 100644
> > > > --- a/security/integrity/digsig.c
> > > > +++ b/security/integrity/digsig.c
> > > > @@ -18,6 +18,7 @@
> > > > #include <linux/cred.h>
> > > > #include <linux/key-type.h>
> > > > #include <linux/digsig.h>
> > > > +#include <linux/vmalloc.h>
> > > > #include <crypto/public_key.h>
> > > > #include <keys/system_keyring.h>
> > >
> > > hm, current linux-next.patch already has this change. What happened here?
> >
> > OK, I see. This is usuall inter tree mess. It didn't fly through your
> > tree:
> > commit 120f3b11ef88fc38ce1d0ff9c9a4b37860ad3140
> > Author: Randy Dunlap <rdunlap@...radead.org>
> > Date: Mon Feb 12 17:26:20 2018 -0800
> >
> > integrity/security: fix digsig.c build error with header file
> >
> > security/integrity/digsig.c has build errors on some $ARCH due to a
> > missing header file, so add it.
> >
> > security/integrity/digsig.c:146:2: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
> >
> > Reported-by: Michael Ellerman <mpe@...erman.id.au>
> > Signed-off-by: Randy Dunlap <rdunlap@...radead.org>
> > Cc: Mimi Zohar <zohar@...ux.vnet.ibm.com>
> > Cc: linux-integrity@...r.kernel.org
> > Link: http://kisskb.ellerman.id.au/kisskb/head/13396/
> > Signed-off-by: James Morris <james.morris@...rosoft.com>
> >
> > And that is why I haven't noticed that.
>
> I can jiggle things to prevent this, but the
> security/integrity/digsig.c fix is actually in mainline now so things
> should sort themselves out OK.
Sure, I have done essentially the same with in my mmotm git tree.
--
Michal Hocko
SUSE Labs
Powered by blists - more mailing lists