[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20111014223804.c955c49972b7b19b5d3b352f@canb.auug.org.au>
Date: Fri, 14 Oct 2011 22:38:04 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Miller <davem@...emloft.net>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
matt.fleming@...el.com, tj@...nel.org, oleg@...hat.com
Subject: Re: linux-next: build failure after merge of the final tree (sparc,
ptrace trees related)
Hi Dave,
On Fri, 14 Oct 2011 03:54:59 -0400 (EDT) David Miller <davem@...emloft.net> wrote:
>
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Fri, 14 Oct 2011 18:07:14 +1100
>
> > After merging the final tree, today's linux-next build (sparc64 defconfig)
> > failed like this:
> >
> > arch/sparc/kernel/signal_64.c: In function 'handle_signal':
> > arch/sparc/kernel/signal_64.c:482:11: error: unused variable 'blocked' [-Werror=unused-variable]
> >
> > Caused by my merge of commits faddf598f0ba ("sparc: Use
> > set_current_blocked()") form the sparc tree and 383fe35697e4 ("sparc: Use
> > set_current_blocked() and block_sigmask()") from the ptrace tree.
> >
> > I have added the following merge fix patch for today.
>
> Now you guys are creating conflicts against those fixed up patches in
> another non-sparc tree, and adding new kinds of build failures as
> well.
To be a little fair, this particular build failure was caused because
when I did the merge, I didn't notice that the "blocked" variables needed
to be removed. But otherwise, I defer to your knowledge.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists