All of
 help / color / mirror / Atom feed
From: Guenter Roeck <>
To: Stephen Rothwell <>
Cc:, LKML <>,
	Markos Chandras <>,, Ralf Baechle <>,
Subject: Re: linux-next: Tree for Feb 16
Date: Mon, 16 Feb 2015 09:12:13 -0800	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

On Thu, Feb 16, 2012 at 04:41:44PM +1100, Stephen Rothwell wrote:
> Hi all,
> Changes since 20120215:
> The net-net tree gained conflicts against the net and wireless trees.
> The fbdev tree gained a build failure for which I reverted a commit.
> I reverted a commit from the rr tree that causes build failures on some
> PowerPC builds.
> The oprofile tree lost its conflict.
> The staging tree gained a build failure so I used the version from
> next-20120215.
> The akpm tree gained a conflict against the wireless tree.  I also
> reverted a patch that caused boot failures on (at least) some PowerPC
> servers.
> ----------------------------------------------------------------------------
> I have created today's linux-next tree at
> git://
> (patches at ).  If you
> are tracking the linux-next tree using git, you should not use "git pull"
> to do so as that will try to merge the new linux-next release with the
> old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
> (see below).
[ Trying again, this time hopefully replying to the correct e-mail.
  Sorry for the earlier noise. ]


Today's tree has a number of new mips related build errors.

Building mips:defconfig ... failed
Building mips:allmodconfig ... failed

Error log:
In file included from ./arch/mips/include/asm/sgiarcs.h:16:0,
                 from ./arch/mips/include/asm/sgialib.h:15,
		 from arch/mips/sgi-ip22/ip22-mc.c:16:
./arch/mips/include/asm/fw/arc/types.h:18:15: error: expected identifier or '(' before '.' token
(more of those)

In file included from ./arch/mips/include/asm/sgialib.h:15:0,
                 from arch/mips/sgi-ip22/ip22-mc.c:16:
./arch/mips/include/asm/sgiarcs.h:89:2: error: unknown type name '_PULONG'
./arch/mips/include/asm/sgiarcs.h:188:2: error: expected specifier-qualifier-list before '.' token
./arch/mips/include/asm/sgiarcs.h:252:2: error: unknown type name '_PLONG'
(more of those)

In file included from arch/mips/sgi-ip22/ip22-mc.c:16:0:
./arch/mips/include/asm/sgialib.h:20:8: error: expected identifier or '(' before '.' token
(more or those)

Bisect points to commit 9119e8276d ("MIPS: asm: hazards: Add MIPSR6
definitions"). Looking into the patch, I wonder if the following is correct.

+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6) && !defined(CONFIG_CPU_CAVIUM_OCTEON)

This change appears to be missing a ( ) around the first two defined()
statements. Fixing that doesn't resolve the problem, though. Reverting
the patch doesn't fix the problem either, so something else must be wrong.

Building mips:cavium_octeon_defconfig ... failed

Error log:
arch/mips/kernel/branch.c: In function '__compute_return_epc_for_insn':
arch/mips/kernel/branch.c:785:2: error: duplicate case value
arch/mips/kernel/branch.c:753:2: error: previously used here
arch/mips/kernel/branch.c:808:2: error: duplicate case value
arch/mips/kernel/branch.c:769:2: error: previously used here
arch/mips/kernel/branch.c:818:2: error: duplicate case value
arch/mips/kernel/branch.c:761:2: error: previously used here
arch/mips/kernel/branch.c:826:2: error: duplicate case value
arch/mips/kernel/branch.c:776:2: error: previously used here

Bisect points to commit 2f1da3620ff2 ("MIPS: Emulate the new MIPS R6 branch
compact (BC) instruction"). Looking into the code, the patch quite obviously
conflicts with cavium support.


  parent reply	other threads:[~2015-02-16 17:12 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-16  5:41 linux-next: Tree for Feb 16 Stephen Rothwell
2012-02-16 15:58 ` linux-next: Tree for Feb 16 (selinux) Randy Dunlap
2012-02-16 19:24   ` Eric Paris
2015-02-16 17:12 ` Guenter Roeck [this message]
2015-02-16 20:36   ` linux-next: Tree for Feb 16 Stephen Rothwell
2015-02-16 20:52     ` Guenter Roeck
2015-02-16  4:39 Stephen Rothwell
2016-02-16  5:53 Stephen Rothwell
2017-02-16  4:46 Stephen Rothwell
2018-02-16  3:25 Stephen Rothwell
2021-02-16 11:08 Stephen Rothwell
2022-02-16  8:42 Stephen Rothwell
2023-02-16  3:57 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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \

* 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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.