* linux-next: build failure after merge of the hid tree
From: Stephen Rothwell @ 2011-12-19 1:34 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, linux-kernel, Tony Breeds
[-- Attachment #1: Type: text/plain, Size: 544 bytes --]
Hi Jiri,
After merging the hid tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/hid/Kconfig:37: syntax error
drivers/hid/Kconfig:36: invalid option
Caused by commit 7e69ba7caeb0 ("HID: introduce proper dependency of
HID_BATTERY on POWER_SUPPLY").
I am sure that this "==" v. "=" in Kconfig files was discussed last
week ... :-(
I have used the hid tree from next-20111216 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: Shawn Guo @ 2011-12-19 1:32 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, linux-next,
linux-kernel, Shawn Guo, Russell King, Richard Zhao
In-Reply-To: <20111219105548.d30839e148800b38bc93d001@canb.auug.org.au>
On Mon, Dec 19, 2011 at 10:55:48AM +1100, Stephen Rothwell wrote:
> Hi all,
>
Hi Stephen,
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-imx/mach-imx6q.c between commit 1237f0f6ecf6 ("ARM: 7198/1:
> arm/imx6: add restart support for imx6q") from the arm tree and commit
> 477fce49aef4 ("arm/imx6q-sabrelite: add enet phy ksz9021rn fixup") from
> the arm-soc tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
It looks all right. Thanks.
--
Regards,
Shawn
^ permalink raw reply
* Re: linux-next: build failure after merge of the vfs tree
From: Al Viro @ 2011-12-19 1:12 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20111219120613.2da854bacb6d6686248bb945@canb.auug.org.au>
On Mon, Dec 19, 2011 at 12:06:13PM +1100, Stephen Rothwell wrote:
> And many more similar.
>
> Probably caused by commit 3073cb2e813c ("trim security.h") which
> presumably removed an include file that was including err.h :-(
>
> I have used the vfs tree from next-20111216 for today.
Fixed and pushed...
^ permalink raw reply
* linux-next: build failure after merge of the vfs tree
From: Stephen Rothwell @ 2011-12-19 1:06 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1457 bytes --]
Hi Al,
After merging the vfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
In file included from include/linux/tracehook.h:51:0,
from arch/powerpc/kernel/ptrace.c:25:
include/linux/security.h: In function 'securityfs_create_dir':
include/linux/security.h:3003:2: error: implicit declaration of function 'ERR_PTR' [-Werror=implicit-function-declaration]
include/linux/security.h:3003:2: error: return makes pointer from integer without a cast [-Werror]
include/linux/security.h: In function 'securityfs_create_file':
include/linux/security.h:3012:2: error: return makes pointer from integer without a cast [-Werror]
In file included from include/linux/fs.h:2283:0,
from include/linux/trace_seq.h:4,
from include/linux/ftrace_event.h:5,
from include/trace/syscall.h:6,
from arch/powerpc/kernel/ptrace.c:32:
include/linux/err.h: At top level:
include/linux/err.h:22:35: error: conflicting types for 'ERR_PTR'
include/linux/security.h:3003:9: note: previous implicit declaration of 'ERR_PTR' was here
And many more similar.
Probably caused by commit 3073cb2e813c ("trim security.h") which
presumably removed an include file that was including err.h :-(
I have used the vfs tree from next-20111216 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the tegra tree with the arm tree
From: Stephen Rothwell @ 2011-12-19 0:14 UTC (permalink / raw)
To: Erik Gilling, Colin Cross, Olof Johansson
Cc: linux-next, linux-kernel, Russell King, Peter De Schrijver
[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/common.c between commit b8a0b3079c03 ("ARM: restart:
tegra: use new restart hook") from the arm tree and commit c37c07ddf269
("arm/tegra: prepare early init for multiple tegra variants") from the
tegra tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-tegra/common.c
index 20f396d,8911e62..0000000
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -31,14 -33,26 +33,24 @@@
#include "clock.h"
#include "fuse.h"
-void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset;
-
+ static const struct of_device_id tegra_dt_irq_match[] __initconst = {
+ { .compatible = "arm,cortex-a9-gic", .data = gic_of_init },
+ { }
+ };
+
+ void __init tegra_dt_init_irq(void)
+ {
+ tegra_init_irq();
+ of_irq_init(tegra_dt_irq_match);
+ }
+
void tegra_assert_system_reset(char mode, const char *cmd)
{
- void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04);
+ void __iomem *reset = IO_ADDRESS(TEGRA_PMC_BASE + 0);
u32 reg;
- /* use *_related to avoid spinlock since caches are off */
reg = readl_relaxed(reset);
- reg |= 0x04;
+ reg |= 0x10;
writel_relaxed(reg, reset);
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the tegra tree with the arm tree
From: Stephen Rothwell @ 2011-12-19 0:14 UTC (permalink / raw)
To: Erik Gilling, Colin Cross, Olof Johansson
Cc: linux-next, linux-kernel, Russell King, Peter De Schrijver
[-- Attachment #1: Type: text/plain, Size: 1012 bytes --]
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/board-dt-tegra20.c (called
arch/arm/mach-tegra/board-dt.c in the arm tree) between commit
b8a0b3079c03 ("ARM: restart: tegra: use new restart hook") from the arm
tree and commit c37c07ddf269 ("arm/tegra: prepare early init for multiple
tegra variants") from the tegra tree.
Just context change. I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-tegra/board-dt-tegra20.c
index e417a83,ddaa037..0000000
--- a/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@@ -134,6 -144,5 +144,6 @@@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegr
.handle_irq = gic_handle_irq,
.timer = &tegra_timer,
.init_machine = tegra_dt_init,
+ .restart = tegra_assert_system_reset,
- .dt_compat = tegra_dt_board_compat,
+ .dt_compat = tegra20_dt_board_compat,
MACHINE_END
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-12-18 23:55 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Russell King
[-- Attachment #1: Type: text/plain, Size: 1498 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-ti8168evm.c between commit fae51fbd5b0b ("ARM:
restart: omap: use new restart hook") from the arm tree and commit
a890b6760d97 ("ARM: OMAP: TI814X: Create board support and enable build
for TI8148 EVM") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-ti8168evm.c
index 74713e3,5b6ad6e..0000000
--- a/arch/arm/mach-omap2/board-ti8168evm.c
+++ b/arch/arm/mach-omap2/board-ti8168evm.c
@@@ -43,10 -47,19 +47,21 @@@ static void __init ti81xx_evm_init(void
MACHINE_START(TI8168EVM, "ti8168evm")
/* Maintainer: Texas Instruments */
.atag_offset = 0x100,
- .map_io = ti8168_evm_map_io,
- .init_early = ti816x_init_early,
- .init_irq = ti816x_init_irq,
+ .map_io = ti81xx_map_io,
+ .init_early = ti81xx_init_early,
+ .init_irq = ti81xx_init_irq,
+ .timer = &omap3_timer,
+ .init_machine = ti81xx_evm_init,
++ .restart = omap_prcm_restart,
+ MACHINE_END
+
+ MACHINE_START(TI8148EVM, "ti8148evm")
+ /* Maintainer: Texas Instruments */
+ .atag_offset = 0x100,
+ .map_io = ti81xx_map_io,
+ .init_early = ti81xx_init_early,
+ .init_irq = ti81xx_init_irq,
.timer = &omap3_timer,
- .init_machine = ti8168_evm_init,
+ .init_machine = ti81xx_evm_init,
+ .restart = omap_prcm_restart,
MACHINE_END
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-12-18 23:55 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Shawn Guo, Russell King, Richard Zhao
[-- Attachment #1: Type: text/plain, Size: 2584 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-imx/mach-imx6q.c between commit 1237f0f6ecf6 ("ARM: 7198/1:
arm/imx6: add restart support for imx6q") from the arm tree and commit
477fce49aef4 ("arm/imx6q-sabrelite: add enet phy ksz9021rn fixup") from
the arm-soc tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-imx/mach-imx6q.c
index 05b49bb,bee6334..0000000
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@@ -16,9 -14,10 +16,11 @@@
#include <linux/irq.h>
#include <linux/irqdomain.h>
#include <linux/of.h>
+#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
+ #include <linux/phy.h>
+ #include <linux/micrel_phy.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/hardware/gic.h>
#include <asm/mach/arch.h>
@@@ -26,38 -25,27 +28,57 @@@
#include <mach/common.h>
#include <mach/hardware.h>
+void imx6q_restart(char mode, const char *cmd)
+{
+ struct device_node *np;
+ void __iomem *wdog_base;
+
+ np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-wdt");
+ wdog_base = of_iomap(np, 0);
+ if (!wdog_base)
+ goto soft;
+
+ imx_src_prepare_restart();
+
+ /* enable wdog */
+ writew_relaxed(1 << 2, wdog_base);
+ /* write twice to ensure the request will not get ignored */
+ writew_relaxed(1 << 2, wdog_base);
+
+ /* wait for reset to assert ... */
+ mdelay(500);
+
+ pr_err("Watchdog reset failed to assert reset\n");
+
+ /* delay to allow the serial port to show the message */
+ mdelay(50);
+
+soft:
+ /* we'll take a jump through zero as a poor second */
+ soft_restart(0);
+}
+
+ /* For imx6q sabrelite board: set KSZ9021RN RGMII pad skew */
+ static int ksz9021rn_phy_fixup(struct phy_device *phydev)
+ {
+ /* min rx data delay */
+ phy_write(phydev, 0x0b, 0x8105);
+ phy_write(phydev, 0x0c, 0x0000);
+
+ /* max rx/tx clock delay, min rx/tx control delay */
+ phy_write(phydev, 0x0b, 0x8104);
+ phy_write(phydev, 0x0c, 0xf0f0);
+ phy_write(phydev, 0x0b, 0x104);
+
+ return 0;
+ }
+
static void __init imx6q_init_machine(void)
{
+ if (of_machine_is_compatible("fsl,imx6q-sabrelite"))
+ phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
+ ksz9021rn_phy_fixup);
+
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
imx6q_pm_init();
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm tree
From: Stephen Rothwell @ 2011-12-18 22:43 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Alexey Dobriyan
In-Reply-To: <20111216140039.c279e8d7.akpm@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 1634 bytes --]
Hi Andrew,
On Fri, 16 Dec 2011 14:00:39 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Fri, 16 Dec 2011 16:39:28 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > After merging the akpm tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > arch/powerpc/kernel/rtas_flash.c: In function 'rtas_flash_release':
> > arch/powerpc/kernel/rtas_flash.c:218:16: error: 'struct proc_dir_entry' has no member named 'count'
> > arch/powerpc/kernel/rtas_flash.c: In function 'rtas_excl_open':
> > arch/powerpc/kernel/rtas_flash.c:343:21: error: 'struct proc_dir_entry' has no member named 'count'
> > arch/powerpc/kernel/rtas_flash.c:348:16: error: 'struct proc_dir_entry' has no member named 'count'
> > arch/powerpc/kernel/rtas_flash.c: In function 'rtas_excl_release':
> > arch/powerpc/kernel/rtas_flash.c:358:16: error: 'struct proc_dir_entry' has no member named 'count'
> > arch/powerpc/kernel/rtas_flash.c: In function 'validate_flash_release':
> > arch/powerpc/kernel/rtas_flash.c:541:16: error: 'struct proc_dir_entry' has no member named 'count'
> >
> > Caused by commit aef714db6205 ("core kernel: add refcount type and
> > refcount misuse debugging").
> >
> > This would also break in drivers/nubus/proc.c
> >
> > I have reverted that commit for today.
>
> Thanks. The plan apepars to be to make `struct kref' usable in this
> situation so I'll drop these patches.
OK, I have dropped that patch from the akpm tree in linux-next.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: Missing gpio/merge branch from linux-next
From: Stephen Rothwell @ 2011-12-18 22:40 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-next
In-Reply-To: <CACxGe6t2QR2P3_gsaCeSo4npgHVurkVqV5uk1k7z8NZ3N62QJQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1874 bytes --]
Hi Grant,
[Have you considered removing the "-2.6" from the tree URLs?]
On Fri, 16 Dec 2011 09:30:29 -0700 Grant Likely <grant.likely@secretlab.ca> wrote:
>
> Can you please add the following tree to linux-next:
>
> gpio-current git git://git.secretlab.ca/git/linux-2.6#gpio/merge
I have added that tree form today.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next tree for s390 and cputime
From: Stephen Rothwell @ 2011-12-18 22:36 UTC (permalink / raw)
To: Martin Schwidefsky; +Cc: Heiko Carstens, linux-next
In-Reply-To: <20111216133712.56957b33@de.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 595 bytes --]
Hi Martin,
On Fri, 16 Dec 2011 13:37:12 +0100 Martin Schwidefsky <schwidefsky@de.ibm.com> wrote:
>
> we completed the move of the s390 tree from marist.edu to kernel.org.
> Please update the git pull for linux-next of the s390 and the cputime
> tree to use the following two new locations:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git features
> git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git cputime
I have switched to using those now.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: strange commit in the uprobes tree
From: Srikar Dronamraju @ 2011-12-18 6:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Paul E. McKenney
In-Reply-To: <20111217182811.ead5e91706f5198f7d7f5560@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [2011-12-17 18:28:11]:
> Hi Srikar,
>
> I just fetched the uprobes tree and noticed that commit 05f7cebbdbc8
> ("rcu: Introduce bulk reference count") has no patch, just a commit
> message. In the previous version of your tree, the commit had Paul as
> author and now has you (which is what brought it to my attention), but
> the lack of patch is more interesting ... I do notice that there is
> another patch from Paul ("rcu: Introduce raw SRCU read-side primitives")
> and was wondering if that replaces the above patch.
>
Thanks Stephen for reporting this. yes, the patch from Paul replaces
the empty commit that you see. After I cherry-picked the 3 commits from
the -tip tree, I had pushed my existing patches that had older Paul's
bulkref patch (removed the changes as part of merge; thats why it shows
my name in author for the faulty commit;) I should have removed the
commit.
Sorry for the inconvienience.
git log --oneline -n 16 output as reported by you.
-----------------------------
6a80f33 perf: perf interface for uprobes
6bb498e perf: rename target_module to target
73cf3b4 tracing: uprobes trace_event interface
b0c3265 tracing: Extract out common code for kprobes/uprobes traceevents.
bdc41f9 tracing: modify is_delete, is_return from ints to bool.
10b7939 uprobes: counter to optimize probe hits.
e7ff3d7 uprobes: slot allocation.
6866510 uprobes: handle breakpoint and signal step exception.
8f5ef11 uprobes: Install and remove breakpoints.
05f7ceb rcu: Introduce bulk reference count
^^^^ faulty commit.
18fe9f4 x86: Call do_notify_resume() with interrupts enabled
557824a x86: Clean up and extend do_int3()
e73ddde rcu: Introduce raw SRCU read-side primitives
^^^^ 3 commits cherry-picked from -tip including the
superseeding patch from Paul.
dc47ce9 Linux 3.2-rc5
8def5f5 Merge git://git.samba.org/sfrench/cifs-2.6
a776878 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
new git log --oneline -n 16 output after making the correction
--------------------------------------------------------------
1b46788 perf: perf interface for uprobes
9b6b4a2 perf: rename target_module to target
ceeb93e tracing: uprobes trace_event interface
fa05b8b tracing: Extract out common code for kprobes/uprobes traceevents.
1a355a5 tracing: modify is_delete, is_return from ints to bool.
3f563d4 uprobes: counter to optimize probe hits.
59c919d uprobes: slot allocation.
599b83b uprobes: handle breakpoint and signal step exception.
70b8389 uprobes: Install and remove breakpoints.
18fe9f4 x86: Call do_notify_resume() with interrupts enabled
557824a x86: Clean up and extend do_int3()
e73ddde rcu: Introduce raw SRCU read-side primitives
dc47ce9 Linux 3.2-rc5
8def5f5 Merge git://git.samba.org/sfrench/cifs-2.6
a776878 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
e2f4e0b Merge branch 'spi/for-3.2' of git://git.pengutronix.de/git/wsa/linux-2.6
I have pushed in the change to for-next branch.
--
Thanks and Regards
Srikar
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (mips tree related)
From: David Daney @ 2011-12-17 18:06 UTC (permalink / raw)
To: Stephen Rothwell, Ralf Baechle
Cc: linux-next, linux-kernel, Hillf Danton, David Daney, linux-mips,
Jayachandran C.
In-Reply-To: <20111217155044.094c4c2b51af7c66e8ec90a3@canb.auug.org.au>
On 12/16/2011 08:50 PM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (mips almost all
> configs) failed like this:
>
> arch/mips/mm/tlb-r4k.c: In function 'local_flush_tlb_range':
> arch/mips/mm/tlb-r4k.c:128: error: 'HPAGE_SIZE' undeclared (first use in this function)
> arch/mips/mm/tlb-r4k.c:130: error: 'HPAGE_SHIFT' undeclared (first use in this function)
>
> Probably caused by commit 0b07e859f87b ("MIPS: Flush huge TLB").
Indeed that is the case.
We have a patch for this issue: http://patchwork.linux-mips.org/patch/3114/
Perhaps Ralf will push out a mips-for-linux-next containing this patch
in the near future.
David Daney
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm tree
From: Alexey Dobriyan @ 2011-12-17 17:49 UTC (permalink / raw)
To: Andrew Morton; +Cc: Stephen Rothwell, linux-next, linux-kernel, benh
In-Reply-To: <20111216140039.c279e8d7.akpm@linux-foundation.org>
On Fri, Dec 16, 2011 at 02:00:39PM -0800, Andrew Morton wrote:
> On Fri, 16 Dec 2011 16:39:28 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Hi Andrew,
> >
> > After merging the akpm tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > arch/powerpc/kernel/rtas_flash.c: In function 'rtas_flash_release':
> > arch/powerpc/kernel/rtas_flash.c:218:16: error: 'struct proc_dir_entry' has no member named 'count'
> > arch/powerpc/kernel/rtas_flash.c: In function 'rtas_excl_open':
> > arch/powerpc/kernel/rtas_flash.c:343:21: error: 'struct proc_dir_entry' has no member named 'count'
> > arch/powerpc/kernel/rtas_flash.c:348:16: error: 'struct proc_dir_entry' has no member named 'count'
> > arch/powerpc/kernel/rtas_flash.c: In function 'rtas_excl_release':
> > arch/powerpc/kernel/rtas_flash.c:358:16: error: 'struct proc_dir_entry' has no member named 'count'
> > arch/powerpc/kernel/rtas_flash.c: In function 'validate_flash_release':
> > arch/powerpc/kernel/rtas_flash.c:541:16: error: 'struct proc_dir_entry' has no member named 'count'
> >
> > Caused by commit aef714db6205 ("core kernel: add refcount type and
> > refcount misuse debugging").
> >
> > This would also break in drivers/nubus/proc.c
> >
> > I have reverted that commit for today.
>
> Thanks. The plan apepars to be to make `struct kref' usable in this
> situation so I'll drop these patches.
If krefs would lose barriers, we might as well remove struct kref altogether.
Besides questionable mandatory passing of destructor to every kref_put(),
it is syntax sugar.
Non-atomic _refcnt_t do not fit into krefs regardless.
Now, rtas_flash.c. What this code simply doesn't work:
->count can be temporarily increased by simply issuing readdir().
^ permalink raw reply
* linux-next: strange commit in the uprobes tree
From: Stephen Rothwell @ 2011-12-17 7:28 UTC (permalink / raw)
To: Srikar Dronamraju; +Cc: linux-next, linux-kernel, Paul E. McKenney
[-- Attachment #1: Type: text/plain, Size: 603 bytes --]
Hi Srikar,
I just fetched the uprobes tree and noticed that commit 05f7cebbdbc8
("rcu: Introduce bulk reference count") has no patch, just a commit
message. In the previous version of your tree, the commit had Paul as
author and now has you (which is what brought it to my attention), but
the lack of patch is more interesting ... I do notice that there is
another patch from Paul ("rcu: Introduce raw SRCU read-side primitives")
and was wondering if that replaces the above patch.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (akpm tree related)
From: NeilBrown @ 2011-12-17 5:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Richard Purdie,
Geert Uytterhoeven, Randy Dunlap
In-Reply-To: <20111217154219.5f3d476c25e648b1b4239857@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1170 bytes --]
On Sat, 17 Dec 2011 15:42:19 +1100 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (m68k allmodconfig)
> failed like this:
>
> drivers/leds/leds-tca6507.c:158: error: field 'gpio' has incomplete type
> drivers/leds/leds-tca6507.c: In function 'tca6507_gpio_set_value':
> drivers/leds/leds-tca6507.c:534: warning: type defaults to 'int' in declaration of '__mptr'
> drivers/leds/leds-tca6507.c:534: warning: initialization from incompatible pointer type
> drivers/leds/leds-tca6507.c: In function 'tca6507_probe':
> drivers/leds/leds-tca6507.c:618: error: implicit declaration of function 'gpiochip_add'
> drivers/leds/leds-tca6507.c: In function 'tca6507_remove':
> drivers/leds/leds-tca6507.c:651: error: implicit declaration of function 'gpiochip_remove'
>
> Caused by commit 7a9244d89523 ("leds: add driver for TCA6507 LED controller").
>
> Maybe this driver needs some dependencies ...
Yes... I think it actually needs the 'gpio' aspect of the driver to be
dependant of GPIOLIB being available.
I'll get a patch or two off to Andrew on Monday.
Thanks,
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (mips tree related)
From: Stephen Rothwell @ 2011-12-17 4:50 UTC (permalink / raw)
To: Ralf Baechle
Cc: linux-next, linux-kernel, Hillf Danton, David Daney, linux-mips,
Jayachandran C.
[-- Attachment #1: Type: text/plain, Size: 530 bytes --]
Hi all,
After merging the final tree, today's linux-next build (mips almost all
configs) failed like this:
arch/mips/mm/tlb-r4k.c: In function 'local_flush_tlb_range':
arch/mips/mm/tlb-r4k.c:128: error: 'HPAGE_SIZE' undeclared (first use in this function)
arch/mips/mm/tlb-r4k.c:130: error: 'HPAGE_SHIFT' undeclared (first use in this function)
Probably caused by commit 0b07e859f87b ("MIPS: Flush huge TLB").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (akpm tree related)
From: Stephen Rothwell @ 2011-12-17 4:42 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, NeilBrown, Richard Purdie,
Geert Uytterhoeven
[-- Attachment #1: Type: text/plain, Size: 970 bytes --]
Hi all,
After merging the final tree, today's linux-next build (m68k allmodconfig)
failed like this:
drivers/leds/leds-tca6507.c:158: error: field 'gpio' has incomplete type
drivers/leds/leds-tca6507.c: In function 'tca6507_gpio_set_value':
drivers/leds/leds-tca6507.c:534: warning: type defaults to 'int' in declaration of '__mptr'
drivers/leds/leds-tca6507.c:534: warning: initialization from incompatible pointer type
drivers/leds/leds-tca6507.c: In function 'tca6507_probe':
drivers/leds/leds-tca6507.c:618: error: implicit declaration of function 'gpiochip_add'
drivers/leds/leds-tca6507.c: In function 'tca6507_remove':
drivers/leds/leds-tca6507.c:651: error: implicit declaration of function 'gpiochip_remove'
Caused by commit 7a9244d89523 ("leds: add driver for TCA6507 LED controller").
Maybe this driver needs some dependencies ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (sound-asoc tree related)
From: Stephen Rothwell @ 2011-12-17 4:34 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel, Vinod Koul
[-- Attachment #1: Type: text/plain, Size: 469 bytes --]
Hi all,
After merging the final tree, today's linux-next build (i386 allmodconfig)
failed like this:
sound/soc/mid-x86/sst_platform.c: In function 'sst_platform_open':
sound/soc/mid-x86/sst_platform.c:274: error: 'ret_val' undeclared (first use in this function)
Caused by commit 03c33042dbcd ("ASoC: sst_platform: fix the dsp driver
interface").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree
From: Stephen Rothwell @ 2011-12-17 4:27 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, David Daney, Paul Mundt
In-Reply-To: <20111217152253.1aedda0936cd5d1d98be5e76@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1025 bytes --]
Hi,
On Sat, 17 Dec 2011 15:22:53 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the final tree, today's linux-next build (sh
> edosk7705_defconfig and lots of other sh configs) failed like this:
>
> mm/pgtable-generic.c: In function 'pmdp_clear_flush_young':
> mm/pgtable-generic.c:76: error: call to '__build_bug_failed' declared with attribute error: BUILD_BUG failed
>
> This is the
>
> VM_BUG_ON(address & ~HPAGE_PMD_MASK);
>
> in pmdp_clear_flush_young().
>
> Exposed by commit 835cea45a4a0 ("hugetlb: replace BUG() with BUILD_BUG()
> for dummy definitions") from the akpm tree but I don't know the root
> cause.
>
> This may have a fix somewhere (if it is sh specific) but the current sh
> tree in linux-next
> (git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git) does
> not exist.
We are getting the same for all the cris config builds.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree
From: Stephen Rothwell @ 2011-12-17 4:22 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, David Daney, Paul Mundt
[-- Attachment #1: Type: text/plain, Size: 839 bytes --]
Hi ,
After merging the final tree, today's linux-next build (sh
edosk7705_defconfig and lots of other sh configs) failed like this:
mm/pgtable-generic.c: In function 'pmdp_clear_flush_young':
mm/pgtable-generic.c:76: error: call to '__build_bug_failed' declared with attribute error: BUILD_BUG failed
This is the
VM_BUG_ON(address & ~HPAGE_PMD_MASK);
in pmdp_clear_flush_young().
Exposed by commit 835cea45a4a0 ("hugetlb: replace BUG() with BUILD_BUG()
for dummy definitions") from the akpm tree but I don't know the root
cause.
This may have a fix somewhere (if it is sh specific) but the current sh
tree in linux-next
(git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git) does
not exist.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for Dec 16 (usb/gadget/langwell)
From: Felipe Balbi @ 2011-12-16 22:35 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, linux-usb, Xiaochen Shen
In-Reply-To: <4EEB98E0.8080002@xenotime.net>
[-- Attachment #1: Type: text/plain, Size: 3263 bytes --]
Hi,
On Fri, Dec 16, 2011 at 11:15:44AM -0800, Randy Dunlap wrote:
> On 12/15/2011 10:00 PM, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20111215:
>
>
> (not new today; I saw this last week but apparently did not
> get around to reporting it)
>
>
> drivers/usb/gadget/langwell_udc.c: In function 'handle_setup_packet':
> drivers/usb/gadget/langwell_udc.c:2321:19: error: 'struct langwell_otg' has no member named 'otg'
> drivers/usb/gadget/langwell_udc.c:2322:15: error: 'struct langwell_otg' has no member named 'hsm'
> drivers/usb/gadget/langwell_udc.c: In function 'handle_usb_reset':
> drivers/usb/gadget/langwell_udc.c:2757:16: error: 'struct langwell_otg' has no member named 'otg'
> drivers/usb/gadget/langwell_udc.c:2758:12: error: 'struct langwell_otg' has no member named 'hsm'
> drivers/usb/gadget/langwell_udc.c: In function 'handle_bus_suspend':
> drivers/usb/gadget/langwell_udc.c:2774:15: error: 'struct langwell_otg' has no member named 'otg'
> drivers/usb/gadget/langwell_udc.c:2775:16: error: 'struct langwell_otg' has no member named 'hsm'
> drivers/usb/gadget/langwell_udc.c:2776:13: error: 'struct langwell_otg' has no member named 'hsm'
> drivers/usb/gadget/langwell_udc.c:2779:5: error: implicit declaration of function 'langwell_update_transceiver'
> drivers/usb/gadget/langwell_udc.c:2783:12: error: 'struct langwell_otg' has no member named 'hsm'
> drivers/usb/gadget/langwell_udc.c:2785:17: error: 'struct langwell_otg' has no member named 'hsm'
> drivers/usb/gadget/langwell_udc.c:2786:13: error: 'struct langwell_otg' has no member named 'hsm'
> drivers/usb/gadget/langwell_udc.c: In function 'handle_bus_resume':
> drivers/usb/gadget/langwell_udc.c:2827:15: error: 'struct langwell_otg' has no member named 'otg'
> drivers/usb/gadget/langwell_udc.c:2828:12: error: 'struct langwell_otg' has no member named 'hsm'
> drivers/usb/gadget/langwell_udc.c: In function 'langwell_udc_probe':
> drivers/usb/gadget/langwell_udc.c:3119:2: error: implicit declaration of function 'otg_to_langwell'
> drivers/usb/gadget/langwell_udc.c:3119:12: warning: assignment makes pointer from integer without a cast
> drivers/usb/gadget/langwell_udc.c:3120:18: error: 'struct langwell_otg' has no member named 'regs'
> drivers/usb/gadget/langwell_udc.c: In function 'init':
> drivers/usb/gadget/langwell_udc.c:3529:2: error: implicit declaration of function 'langwell_register_peripheral'
> drivers/usb/gadget/langwell_udc.c: In function 'cleanup':
> drivers/usb/gadget/langwell_udc.c:3540:2: error: implicit declaration of function 'langwell_unregister_peripheral'
> drivers/usb/gadget/langwell_udc.c:3540:2: warning: 'return' with a value, in function returning void
aparently this has never been compiled with CONFIG_USB_LANGWELL_OTG
before.
Xiaochen, please fix that ASAP. Now that I look at it, that driver
should have been on staging. It's pretty messed up. Isn't it one of
those devices which is based on ChipIdea's core ? I wonder when that
consolidation work will get done.
I expect to see this fixed still on 3.2 series. Also needs a backport to
fix older stable kernels. v2.6.31 is the first kernel with that driver
available.
Thanks for the report Randy
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm tree
From: Andrew Morton @ 2011-12-16 22:00 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Alexey Dobriyan
In-Reply-To: <20111216163928.030494ce1beb330e4e8b7b40@canb.auug.org.au>
On Fri, 16 Dec 2011 16:39:28 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> After merging the akpm tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> arch/powerpc/kernel/rtas_flash.c: In function 'rtas_flash_release':
> arch/powerpc/kernel/rtas_flash.c:218:16: error: 'struct proc_dir_entry' has no member named 'count'
> arch/powerpc/kernel/rtas_flash.c: In function 'rtas_excl_open':
> arch/powerpc/kernel/rtas_flash.c:343:21: error: 'struct proc_dir_entry' has no member named 'count'
> arch/powerpc/kernel/rtas_flash.c:348:16: error: 'struct proc_dir_entry' has no member named 'count'
> arch/powerpc/kernel/rtas_flash.c: In function 'rtas_excl_release':
> arch/powerpc/kernel/rtas_flash.c:358:16: error: 'struct proc_dir_entry' has no member named 'count'
> arch/powerpc/kernel/rtas_flash.c: In function 'validate_flash_release':
> arch/powerpc/kernel/rtas_flash.c:541:16: error: 'struct proc_dir_entry' has no member named 'count'
>
> Caused by commit aef714db6205 ("core kernel: add refcount type and
> refcount misuse debugging").
>
> This would also break in drivers/nubus/proc.c
>
> I have reverted that commit for today.
Thanks. The plan apepars to be to make `struct kref' usable in this
situation so I'll drop these patches.
^ permalink raw reply
* Re: linux-next: Tree for Dec 16 (leds/tca6507)
From: Randy Dunlap @ 2011-12-16 22:25 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, NeilBrown, Richard Purdie
In-Reply-To: <20111216170042.650147ec79e792dce950f6e3@canb.auug.org.au>
On 12/15/2011 10:00 PM, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20111215:
When GPIOLIB is not enabled:
drivers/leds/leds-tca6507.c:158:20: error: field 'gpio' has incomplete type
drivers/leds/leds-tca6507.c: In function 'tca6507_gpio_set_value':
drivers/leds/leds-tca6507.c:534:29: warning: type defaults to 'int' in declaration of '__mptr'
drivers/leds/leds-tca6507.c:534:29: warning: initialization from incompatible pointer type
drivers/leds/leds-tca6507.c: In function 'tca6507_probe':
drivers/leds/leds-tca6507.c:618:3: error: implicit declaration of function 'gpiochip_add'
drivers/leds/leds-tca6507.c: In function 'tca6507_remove':
drivers/leds/leds-tca6507.c:651:3: error: implicit declaration of function 'gpiochip_remove'
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next: Tree for Dec 16 (intel_scu & abp_timer)
From: Alan Cox @ 2011-12-16 18:50 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, platform-driver-x86,
Sreedhara, Jacob Pan
In-Reply-To: <4EEB9F3E.7080609@xenotime.net>
On Fri, 16 Dec 2011 11:42:54 -0800
Randy Dunlap <rdunlap@xenotime.net> wrote:
> On 12/15/2011 10:00 PM, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20111215:
>
>
> warning: (X86_MRST && X86_MDFLD) selects INTEL_SCU_IPC which has unmet direct dependencies (X86 && X86_PLATFORM_DEVICES && X86_MRST)
I sent Ingo a fix for part of this, and Matthew another one last week. I
have another fix I just need to check a few more build combinations to
follow and hopefully finish the shuffle of config names.
Alan
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox