Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Herbert Xu <herbert@gondor.apana.org.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	netdev@vger.kernel.org
Subject: Re: linux-next: build failures after merge of the vfs tree
Date: Tue, 30 Jun 2020 12:14:01 +1000
Message-ID: <20200630021401.GA20427@gondor.apana.org.au> (raw)
In-Reply-To: <20200630115857.48eab55d@canb.auug.org.au>

On Tue, Jun 30, 2020 at 11:58:57AM +1000, Stephen Rothwell wrote:
>
> > > OK, here's a patch for both of these together:
> > > 
> > > diff --git a/arch/s390/lib/test_unwind.c b/arch/s390/lib/test_unwind.c
> > > index 32b7a30b2485..eb382ceaa116 100644
> > > --- a/arch/s390/lib/test_unwind.c
> > > +++ b/arch/s390/lib/test_unwind.c
> > > @@ -9,6 +9,7 @@
> > >  #include <linux/kallsyms.h>
> > >  #include <linux/kthread.h>
> > >  #include <linux/module.h>
> > > +#include <linux/slab.h>
> > >  #include <linux/string.h>
> > >  #include <linux/kprobes.h>
> > >  #include <linux/wait.h>
> > > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
> > > index feb70283b6a2..903b2bb97e12 100644
> > > --- a/drivers/remoteproc/qcom_q6v5_mss.c
> > > +++ b/drivers/remoteproc/qcom_q6v5_mss.c
> > > @@ -26,6 +26,7 @@
> > >  #include <linux/reset.h>
> > >  #include <linux/soc/qcom/mdt_loader.h>
> > >  #include <linux/iopoll.h>
> > > +#include <linux/slab.h>
> > >  
> > >  #include "remoteproc_internal.h"
> > >  #include "qcom_common.h"  
> > 
> > I have applied those 2 by hand for today.
> 
> I am still applying the above patch.

Hi Al:

Could you please fold these changes into your tree?

Thanks,
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

  reply index

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-16  0:33 Stephen Rothwell
2020-06-16  0:34 ` Stephen Rothwell
2020-06-16  1:05   ` Herbert Xu
2020-06-16  3:38     ` Al Viro
2020-06-16 14:38       ` Herbert Xu
2020-06-16 15:14         ` Al Viro
2020-06-17  6:57         ` Stephen Rothwell
2020-06-17  7:03           ` Herbert Xu
2020-06-17  7:31             ` Stephen Rothwell
2020-06-17  7:38               ` Herbert Xu
2020-06-18  0:08                 ` Stephen Rothwell
2020-06-30  1:58                   ` Stephen Rothwell
2020-06-30  2:14                     ` Herbert Xu [this message]
2020-06-30 13:36                       ` Al Viro
2020-06-17  8:06             ` Stephen Rothwell

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=20200630021401.GA20427@gondor.apana.org.au \
    --to=herbert@gondor.apana.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=viro@zeniv.linux.org.uk \
    /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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git