From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
matt.fleming@intel.com, tj@kernel.org, oleg@redhat.com
Subject: Re: linux-next: build failure after merge of the final tree (sparc, ptrace trees related)
Date: Fri, 14 Oct 2011 03:54:59 -0400 (EDT) [thread overview]
Message-ID: <20111014.035459.2238341687770152474.davem@davemloft.net> (raw)
In-Reply-To: <20111014180714.e11e15fd35dfaca839c6421e@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.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.
They didn't build test the original version of the signal patches I
put into the sparc tree either, which is why I fixed them up and put
them into the sparc GIT tree.
Ptrace folks can we not operate like this? The only reason I found
out about the set_current_blocked() transformations was by accident,
because the original patch was posted to linux-kernel only so it never
got queued up into sparc patchwork.
Then once Oleg mentioned it to me, it didn't even compile so I fixed
it up and put the fixed up copy into my tree. It also didn't
transform the TS_RESTORE_SIGMASK cases in the sparc signal code, so I
also added a patch to the sparc tree which took care of that.
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.
This doesn't work.
next prev parent reply other threads:[~2011-10-14 7:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-14 7:07 Stephen Rothwell
2011-10-14 7:54 ` David Miller [this message]
2011-10-14 9:27 ` Matt Fleming
2011-10-14 11:38 ` Stephen Rothwell
2011-10-14 19:09 ` Oleg Nesterov
2011-10-24 9:36 ` 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=20111014.035459.2238341687770152474.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=matt.fleming@intel.com \
--cc=oleg@redhat.com \
--cc=sfr@canb.auug.org.au \
--cc=tj@kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®