* Re: linux-next: build failure after merge of the md tree
From: NeilBrown @ 2012-04-11 4:48 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jim Kukunas, H. Peter Anvin
In-Reply-To: <20120411134259.61f755a90055b23a6876687b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1228 bytes --]
On Wed, 11 Apr 2012 13:42:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:
> Hi Neil,
>
> After merging the md tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> lib/raid6/recov.c: In function 'raid6_has_ssse3':
> lib/raid6/recov.c:27:2: error: implicit declaration of function 'boot_cpu_has' [-Werror=implicit-function-declaration]
> lib/raid6/recov.c:27:22: error: 'X86_FEATURE_XMM' undeclared (first use in this function)
> lib/raid6/recov.c:27:22: note: each undeclared identifier is reported only once for each function it appears in
> lib/raid6/recov.c:28:16: error: 'X86_FEATURE_XMM2' undeclared (first use in this function)
> lib/raid6/recov.c:29:16: error: 'X86_FEATURE_SSSE3' undeclared (first use in this function)
> lib/raid6/recov.c: At top level:
> lib/raid6/recov.c:25:12: warning: 'raid6_has_ssse3' defined but not used [-Wunused-function]
>
> Caused by commit 56d3ac7ef905 ("lib/raid6: Add SSSE3 optimized recovery
> functions"). All the world is not X86 :-)
>
> I have used the md tree from next-20120410 for today.
Thanks Stephen,
I've removed that set of patches from my for-next pending further review and
revision.
Thanks,
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply
* Re: linux-next: triage for April 10, 2012
From: Stephen Rothwell @ 2012-04-11 4:35 UTC (permalink / raw)
To: Mike Frysinger
Cc: Paul Gortmaker, linux-next, linux-kernel, uclinux-dist-devel,
Sonic Zhang, Bob Liu
In-Reply-To: <CAMjpGUeKvP-fJG1sUPRtFDUWCwBg-19JFiFOAKJGmR8Pn4-XUA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 711 bytes --]
Hi Mike,
On Tue, 10 Apr 2012 23:37:24 -0400 Mike Frysinger <vapier.adi@gmail.com> wrote:
>
> On Tue, Apr 10, 2012 at 23:09, Paul Gortmaker wrote:
> > Thanks Mike, I'll fix the stale link. Here is a RELOC_BFIN_10 fail:
> >
> > http://kisskb.ellerman.id.au/kisskb/buildresult/6087324/
>
> hrm, i'm not seeing that here, but i'm using binutils-2.21. we prob
> should file a bug for the Blackfin toolchain guys to investigate.
>
> what version of binutils are you using ?
$ /opt/cross/gcc-4.6-nolibc/bfin-uclinux/bin/bfin-uclinux-ld --version
GNU ld (GNU Binutils) 2.22
This is a cross toolchain hosted in PowerPC.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the regmap tree
From: Stephen Rothwell @ 2012-04-11 4:13 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-next, linux-kernel, Stephen Warren
[-- Attachment #1: Type: text/plain, Size: 834 bytes --]
Hi Mark,
After merging the regmap tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/base/regmap/regmap-irq.c: In function 'regmap_irq_sync_unlock':
drivers/base/regmap/regmap-irq.c:62:12: error: 'map' undeclared (first use in this function)
drivers/base/regmap/regmap-irq.c: In function 'regmap_irq_enable':
drivers/base/regmap/regmap-irq.c:77:37: error: 'map' undeclared (first use in this function)
drivers/base/regmap/regmap-irq.c: In function 'regmap_irq_disable':
drivers/base/regmap/regmap-irq.c:85:37: error: 'map' undeclared (first use in this function)
Caused by commit f01ee60fffa4 ("regmap: implement register striding").
Please build test ...
I have used the regmap tree from next-20120410 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the md tree
From: H. Peter Anvin @ 2012-04-11 3:54 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Neil Brown, linux-next, linux-kernel, Jim Kukunas
In-Reply-To: <20120411134259.61f755a90055b23a6876687b@canb.auug.org.au>
On 04/10/2012 08:42 PM, Stephen Rothwell wrote:
> Hi Neil,
>
> After merging the md tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> lib/raid6/recov.c: In function 'raid6_has_ssse3':
> lib/raid6/recov.c:27:2: error: implicit declaration of function
> 'boot_cpu_has' [-Werror=implicit-function-declaration]
> lib/raid6/recov.c:27:22: error: 'X86_FEATURE_XMM' undeclared (first
> use in this function) lib/raid6/recov.c:27:22: note: each
> undeclared identifier is reported only once for each function it
> appears in lib/raid6/recov.c:28:16: error: 'X86_FEATURE_XMM2'
> undeclared (first use in this function) lib/raid6/recov.c:29:16:
> error: 'X86_FEATURE_SSSE3' undeclared (first use in this function)
> lib/raid6/recov.c: At top level: lib/raid6/recov.c:25:12: warning:
> 'raid6_has_ssse3' defined but not used [-Wunused-function]
>
> Caused by commit 56d3ac7ef905 ("lib/raid6: Add SSSE3 optimized
> recovery functions"). All the world is not X86 :-)
>
> I have used the md tree from next-20120410 for today.
While on the subject it would be nice to factor this out into a
separate file.
-hpa
--
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel. I don't speak on their behalf.
^ permalink raw reply
* linux-next: build failure after merge of the md tree
From: Stephen Rothwell @ 2012-04-11 3:42 UTC (permalink / raw)
To: Neil Brown; +Cc: linux-next, linux-kernel, Jim Kukunas, H. Peter Anvin
[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]
Hi Neil,
After merging the md tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
lib/raid6/recov.c: In function 'raid6_has_ssse3':
lib/raid6/recov.c:27:2: error: implicit declaration of function 'boot_cpu_has' [-Werror=implicit-function-declaration]
lib/raid6/recov.c:27:22: error: 'X86_FEATURE_XMM' undeclared (first use in this function)
lib/raid6/recov.c:27:22: note: each undeclared identifier is reported only once for each function it appears in
lib/raid6/recov.c:28:16: error: 'X86_FEATURE_XMM2' undeclared (first use in this function)
lib/raid6/recov.c:29:16: error: 'X86_FEATURE_SSSE3' undeclared (first use in this function)
lib/raid6/recov.c: At top level:
lib/raid6/recov.c:25:12: warning: 'raid6_has_ssse3' defined but not used [-Wunused-function]
Caused by commit 56d3ac7ef905 ("lib/raid6: Add SSSE3 optimized recovery
functions"). All the world is not X86 :-)
I have used the md tree from next-20120410 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: triage for April 10, 2012
From: Mike Frysinger @ 2012-04-11 3:37 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, uclinux-dist-devel, Sonic Zhang,
Bob Liu
In-Reply-To: <CAP=VYLrzvXCTD4J3sdhMCjnsPKvf-tobkE0G6OgTvc4mnEiw7A@mail.gmail.com>
On Tue, Apr 10, 2012 at 23:09, Paul Gortmaker wrote:
> Thanks Mike, I'll fix the stale link. Here is a RELOC_BFIN_10 fail:
>
> http://kisskb.ellerman.id.au/kisskb/buildresult/6087324/
hrm, i'm not seeing that here, but i'm using binutils-2.21. we prob
should file a bug for the Blackfin toolchain guys to investigate.
what version of binutils are you using ?
> Looks like I should go over the bfin fails and check each one, since
> they are somewhat unique -- e.g.
>
> arch/blackfin/mach-bf537/boards/dnp5370.c:392:17: error:
> 'bfin_spi_board_info' undeclared (first use in this function)
>
> in DNP5370_defconfig
blah, looks like something got renamed, but not all the way
commit 7d157fb02bc3f4dc74e6830725864ba501d92da7
blackfin: config: update macro SPI_BFIN in board file
that renamed SPI_BFIN to SPI_BFIN5XX in the board files
but the commit in drivers/spi/ hasn't been merged yet, so it's still
SPI_BFIN there
-mike
^ permalink raw reply
* Re: linux-next: triage for April 10, 2012
From: Paul Gortmaker @ 2012-04-11 3:09 UTC (permalink / raw)
To: Mike Frysinger; +Cc: linux-next, linux-kernel
In-Reply-To: <CAMjpGUetfGQxqTKVfLBtOdthxFtFv-knuXSWoNx0BKxJd=829Q@mail.gmail.com>
On Tue, Apr 10, 2012 at 10:50 PM, Mike Frysinger <vapier.adi@gmail.com> wrote:
> On Tue, Apr 10, 2012 at 18:45, Paul Gortmaker
> <paul.gortmaker@windriver.com> wrote:
>> bfin: 50% of builds
>> when: Mar 31
>> why: "Error: pcrel too far BFD_RELOC_BFIN_10" from kernel/time/timekeeping.c
>> status: unknown, binutils issue?
>> fix:
>> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5981475/
>
> that log file doesn't say anything about "BFD_RELOC_BFIN_10"
Thanks Mike, I'll fix the stale link. Here is a RELOC_BFIN_10 fail:
http://kisskb.ellerman.id.au/kisskb/buildresult/6087324/
Looks like I should go over the bfin fails and check each one, since
they are somewhat unique -- e.g.
arch/blackfin/mach-bf537/boards/dnp5370.c:392:17: error:
'bfin_spi_board_info' undeclared (first use in this function)
in DNP5370_defconfig
and
arch/blackfin/mach-bf533/boards/ip0x.c:299:26: error:
'bfin_spi_board_info' undeclared (first use in this function)
in IP0X_defconfig
http://kisskb.ellerman.id.au/kisskb/buildresult/6087345/
are not related to the RELOC_BFIN_10
Paul.
--
>
> it does show the old L1 data overflow though ...
>
> on a side note, the warning:
> arch/blackfin/mm/init.c:79:9: warning: array subscript is above array
> bounds [-Warray-bounds]
> is a bad thing, but i've just pushed a fix for that ...
> -mike
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply
* linux-next: manual merge of the wireless-next tree with the net-next tree
From: Stephen Rothwell @ 2012-04-11 2:56 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, David Miller, netdev, Javier Cardona,
Marco Porsch, Pavel Zubarev
[-- Attachment #1: Type: text/plain, Size: 6481 bytes --]
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
net/wireless/nl80211.c between commit 9360ffd18597 ("wireless: Stop using
NLA_PUT*()") from the net-next tree and commit d299a1f21ea7 ("{nl,cfg}
80211: Support for mesh synchronization") from the wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/wireless/nl80211.c
index 65622e9,b12a052..0000000
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -2540,17 -2486,18 +2543,20 @@@ static int nl80211_send_station(struct
nla_nest_end(msg, bss_param);
}
- if (sinfo->filled & STATION_INFO_STA_FLAGS)
- NLA_PUT(msg, NL80211_STA_INFO_STA_FLAGS,
- sizeof(struct nl80211_sta_flag_update),
- &sinfo->sta_flags);
- if (sinfo->filled & STATION_INFO_T_OFFSET)
- NLA_PUT_U64(msg, NL80211_STA_INFO_T_OFFSET,
- sinfo->t_offset);
+ if ((sinfo->filled & STATION_INFO_STA_FLAGS) &&
+ nla_put(msg, NL80211_STA_INFO_STA_FLAGS,
+ sizeof(struct nl80211_sta_flag_update),
+ &sinfo->sta_flags))
+ goto nla_put_failure;
++ if ((sinfo->filled & STATION_INFO_T_OFFSET) &&
++ nla_put_u64(msg, NL80211_STA_INFO_T_OFFSET, sinfo->t_offset))
++ goto nla_put_failure;
nla_nest_end(msg, sinfoattr);
- if (sinfo->filled & STATION_INFO_ASSOC_REQ_IES)
- NLA_PUT(msg, NL80211_ATTR_IE, sinfo->assoc_req_ies_len,
- sinfo->assoc_req_ies);
+ if ((sinfo->filled & STATION_INFO_ASSOC_REQ_IES) &&
+ nla_put(msg, NL80211_ATTR_IE, sinfo->assoc_req_ies_len,
+ sinfo->assoc_req_ies))
+ goto nla_put_failure;
return genlmsg_end(msg, hdr);
@@@ -3328,48 -3274,49 +3334,50 @@@ static int nl80211_get_mesh_config(stru
pinfoattr = nla_nest_start(msg, NL80211_ATTR_MESH_CONFIG);
if (!pinfoattr)
goto nla_put_failure;
- NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, dev->ifindex);
- NLA_PUT_U16(msg, NL80211_MESHCONF_RETRY_TIMEOUT,
- cur_params.dot11MeshRetryTimeout);
- NLA_PUT_U16(msg, NL80211_MESHCONF_CONFIRM_TIMEOUT,
- cur_params.dot11MeshConfirmTimeout);
- NLA_PUT_U16(msg, NL80211_MESHCONF_HOLDING_TIMEOUT,
- cur_params.dot11MeshHoldingTimeout);
- NLA_PUT_U16(msg, NL80211_MESHCONF_MAX_PEER_LINKS,
- cur_params.dot11MeshMaxPeerLinks);
- NLA_PUT_U8(msg, NL80211_MESHCONF_MAX_RETRIES,
- cur_params.dot11MeshMaxRetries);
- NLA_PUT_U8(msg, NL80211_MESHCONF_TTL,
- cur_params.dot11MeshTTL);
- NLA_PUT_U8(msg, NL80211_MESHCONF_ELEMENT_TTL,
- cur_params.element_ttl);
- NLA_PUT_U8(msg, NL80211_MESHCONF_AUTO_OPEN_PLINKS,
- cur_params.auto_open_plinks);
- NLA_PUT_U32(msg, NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
- cur_params.dot11MeshNbrOffsetMaxNeighbor);
- NLA_PUT_U8(msg, NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES,
- cur_params.dot11MeshHWMPmaxPREQretries);
- NLA_PUT_U32(msg, NL80211_MESHCONF_PATH_REFRESH_TIME,
- cur_params.path_refresh_time);
- NLA_PUT_U16(msg, NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT,
- cur_params.min_discovery_timeout);
- NLA_PUT_U32(msg, NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
- cur_params.dot11MeshHWMPactivePathTimeout);
- NLA_PUT_U16(msg, NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
- cur_params.dot11MeshHWMPpreqMinInterval);
- NLA_PUT_U16(msg, NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
- cur_params.dot11MeshHWMPperrMinInterval);
- NLA_PUT_U16(msg, NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
- cur_params.dot11MeshHWMPnetDiameterTraversalTime);
- NLA_PUT_U8(msg, NL80211_MESHCONF_HWMP_ROOTMODE,
- cur_params.dot11MeshHWMPRootMode);
- NLA_PUT_U16(msg, NL80211_MESHCONF_HWMP_RANN_INTERVAL,
- cur_params.dot11MeshHWMPRannInterval);
- NLA_PUT_U8(msg, NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
- cur_params.dot11MeshGateAnnouncementProtocol);
- NLA_PUT_U8(msg, NL80211_MESHCONF_FORWARDING,
- cur_params.dot11MeshForwarding);
- NLA_PUT_U32(msg, NL80211_MESHCONF_RSSI_THRESHOLD,
- cur_params.rssi_threshold);
+ if (nla_put_u32(msg, NL80211_ATTR_IFINDEX, dev->ifindex) ||
+ nla_put_u16(msg, NL80211_MESHCONF_RETRY_TIMEOUT,
+ cur_params.dot11MeshRetryTimeout) ||
+ nla_put_u16(msg, NL80211_MESHCONF_CONFIRM_TIMEOUT,
+ cur_params.dot11MeshConfirmTimeout) ||
+ nla_put_u16(msg, NL80211_MESHCONF_HOLDING_TIMEOUT,
+ cur_params.dot11MeshHoldingTimeout) ||
+ nla_put_u16(msg, NL80211_MESHCONF_MAX_PEER_LINKS,
+ cur_params.dot11MeshMaxPeerLinks) ||
+ nla_put_u8(msg, NL80211_MESHCONF_MAX_RETRIES,
+ cur_params.dot11MeshMaxRetries) ||
+ nla_put_u8(msg, NL80211_MESHCONF_TTL,
+ cur_params.dot11MeshTTL) ||
+ nla_put_u8(msg, NL80211_MESHCONF_ELEMENT_TTL,
+ cur_params.element_ttl) ||
+ nla_put_u8(msg, NL80211_MESHCONF_AUTO_OPEN_PLINKS,
+ cur_params.auto_open_plinks) ||
++ nla_put_u32(msg, NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
++ cur_params.dot11MeshNbrOffsetMaxNeighbor) ||
+ nla_put_u8(msg, NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES,
+ cur_params.dot11MeshHWMPmaxPREQretries) ||
+ nla_put_u32(msg, NL80211_MESHCONF_PATH_REFRESH_TIME,
+ cur_params.path_refresh_time) ||
+ nla_put_u16(msg, NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT,
+ cur_params.min_discovery_timeout) ||
+ nla_put_u32(msg, NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
+ cur_params.dot11MeshHWMPactivePathTimeout) ||
+ nla_put_u16(msg, NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
+ cur_params.dot11MeshHWMPpreqMinInterval) ||
+ nla_put_u16(msg, NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
+ cur_params.dot11MeshHWMPperrMinInterval) ||
+ nla_put_u16(msg, NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
+ cur_params.dot11MeshHWMPnetDiameterTraversalTime) ||
+ nla_put_u8(msg, NL80211_MESHCONF_HWMP_ROOTMODE,
+ cur_params.dot11MeshHWMPRootMode) ||
+ nla_put_u16(msg, NL80211_MESHCONF_HWMP_RANN_INTERVAL,
+ cur_params.dot11MeshHWMPRannInterval) ||
+ nla_put_u8(msg, NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
+ cur_params.dot11MeshGateAnnouncementProtocol) ||
+ nla_put_u8(msg, NL80211_MESHCONF_FORWARDING,
+ cur_params.dot11MeshForwarding) ||
+ nla_put_u32(msg, NL80211_MESHCONF_RSSI_THRESHOLD,
+ cur_params.rssi_threshold))
+ goto nla_put_failure;
nla_nest_end(msg, pinfoattr);
genlmsg_end(msg, hdr);
return genlmsg_reply(msg, info);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: triage for April 10, 2012
From: Mike Frysinger @ 2012-04-11 2:50 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel
In-Reply-To: <20120410224543.GA11433@windriver.com>
On Tue, Apr 10, 2012 at 18:45, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> bfin: 50% of builds
> when: Mar 31
> why: "Error: pcrel too far BFD_RELOC_BFIN_10" from kernel/time/timekeeping.c
> status: unknown, binutils issue?
> fix:
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5981475/
that log file doesn't say anything about "BFD_RELOC_BFIN_10"
it does show the old L1 data overflow though ...
on a side note, the warning:
arch/blackfin/mm/init.c:79:9: warning: array subscript is above array
bounds [-Warray-bounds]
is a bad thing, but i've just pushed a fix for that ...
-mike
^ permalink raw reply
* linux-next: build failure after merge of the v4l-dvb tree
From: Stephen Rothwell @ 2012-04-11 2:10 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, Srinivas Kandagatla, stable
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
Hi Mauro,
After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:
ERROR: "__kfifo_max_r" [drivers/media/rc/rc-core.ko] undefined!
Caused by commit 24a19bcbceda ("[media] ir-raw: Check available elements
in kfifo before adding"). kfifo_avail expands to a call to __kfifo_max_r
which is not exported to modules.
I have used the v4l-dvb tree from next-20120410 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: triage for April 10, 2012
From: Paul Gortmaker @ 2012-04-10 22:45 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
I didn't do a report on Friday for Thursday's tree, however
there were four new breakages at the end of last week. I did
a triage on them and sent notifications to those maintainers.
(and cc'd linux-next). DaveM checked in fixes for blackfin eth
and gianfar eth as soon as I reported them, leaving only the
regmap_debugfs_init bug and and the GPLV2 vs GPLv2 typo carried
forward into this week's report (listed below).
We've finally got an sh tree inserted into linux-next, so a
a whole bunch of sh4 builds are now green again. Probably
makes sense to go through and triage the remaining failures
as "new". I have not done that yet here today since there
are about 20 or so.
------------
New breakage since last report:
i386:allmodconfig:
(modpost: GPL-incompat rc5t583-regulator uses GPL-only symbol)
ARM/MIPS:magician_defconfig,omap1_defconfig,ip27_defconfig
(regmap.c: too few arg to 'regmap_debugfs_init')
ARM:eseries_pxa_defconfig,em_x270_defconfig,imx_v4_v5_defconfig
(sound/soc/codecs/wm9712.c: error: 'runtime' undeclared)
s390/sparc:allmodconfig,allyesconfig
(wiznet Kconfig fallout, fixed by DaveM already)
ARM:cam60_defconfig (kallsyms, ignore it).
Randconfig fails that may or may not be new (by their very nature):
i386: fs/binfmt_misc.c (copy_from_user() is not provably correct)
http://kisskb.ellerman.id.au/kisskb/buildresult/6087086/
powerpc: kernel/built-in.o: undefined ref `perf_ftrace_event_register'
http://kisskb.ellerman.id.au/kisskb/buildresult/6087164/
Fix: https://lkml.org/lkml/2012/3/14/304
Builds that are fixed since last report:
ia64:defconfig
sh4:about 1/2 of all builds.
Note: The randconfig fails are only listed once and not tracked
in the below listing.
I'm also not tracking the kallsyms extra pass stuff on ARM on
a per board basis anymore. It has nothing to do with the board.
Why? See: http://marc.info/?l=linux-next&m=133267456809502
------------------------------------------------
Latest results at:
http://kisskb.ellerman.id.au/kisskb/branch/9/
Failures as of April 10th, 2012:
===============================
s390/sparc:allmodconfig,allyesconfig
when: Apr 10
why: w5100.c: implicit declaration of function 'ioread8'
status: Kconfig not guarded from incompat arch.
fix: https://lkml.org/lkml/2012/4/10/194
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6086850/
----------------
AM33:asb2303_defconfig,asb2364_defconfig
when: Mar 15
why: cc1: error: unrecognized command line option '-mmem-funcs'
status: Possible fix from TonyB sent for review.
fix: http://marc.info/?l=linux-kernel&m=133185020313818&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5878400/
----------------
ARM:eseries_pxa_defconfig,em_x270_defconfig,imx_v4_v5_defconfig
when: Apr 10
why: sound/soc/codecs/wm9712.c: error: 'runtime' undeclared
status:
fix:
ref: http://marc.info/?l=linux-next&m=133409405513987&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6086893/
ARM/MIPS:magician_defconfig,omap1_defconfig,ip27_defconfig
when: Apr 5
why: regmap.c: too few args to 'regmap_debugfs_init'
status: reported
fix:
ref: http://marc.info/?l=linux-next&m=133368924324160&w=2
ARM:tct_hammer_defconfig,s3c2410_defconfig
when: Apr 1
why: missing "common.h"
status: fix pending, borkage probably masked by other global borkage.
fix:
ref: http://marc.info/?l=linux-next&m=133349249421262&w=2
ARM:netx_defconfig,pnx4008_defconfig
when: Mar 14
why: net/core/pktgen.c: can't find a register in class 'GENERAL_REGS'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5869486/
ref: https://lkml.org/lkml/2012/3/13/670
ARM:ixp4xx_defconfig
when: Oct 26
why: gpio.h: implicit declaration of function '__gpio_get_value'
status: fixed (Imre Kaloz) - but possibly needs rework?
fix: https://lkml.org/lkml/2012/2/8/288
ref: https://lkml.org/lkml/2012/2/8/287
ARM:raumfeld_defconfig
when: Nov 23
why: eeti_ts.c: implicit declaration of function 'irq_to_gpio'
status: perhaps broken since 2010? See ref below.
fix:
ref: http://www.gossamer-threads.com/lists/linux/kernel/1291618?do=post_view_threaded#1291618
ARM:arm-allnoconfig
when: forever
why: not supported
status: nothing pending, but patches accepted
fix: n/a
ref: https://lkml.org/lkml/2009/4/30/105
ref: http://lists.infradead.org/pipermail/linux-arm-kernel/2012-January/081218.html
----------------
AVR32:allnoconfig
when: May 26 2010, 20:49
why: at32_map_usart: undefined reference to `atmel_default_console_device'
status:
fix:
ref:
---------------
bfin: 50% of builds
when: Mar 31
why: "Error: pcrel too far BFD_RELOC_BFIN_10" from kernel/time/timekeeping.c
status: unknown, binutils issue?
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5981475/
---------------
cris:allyesconfig,allmodconfig
when: Apr 3
why: too many to list here
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035250/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035249/
----------------
frv:defconfig
when: Mar 15
why: undefined reference to `pci_cardbus_resource_alignment'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6030067/
----------------
i386:allmodconfig
when: Apr 5
why: FATAL: modpost: GPL-incompatible module rc5t583-regulator.ko uses GPL-only symbol 'platform_driver_unregister'
status: reported
fix:
ref: http://marc.info/?l=linux-next&m=133369125624696&w=2
----------------
h8300:defconfig
when: Mar 15
why: time.c: implicit declaration of function 'get_irq_regs'
why: also seems gcc suffers an ICE
status: ICE bug lodged with gcc folks (TonyB)
fix:
ref: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52598
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884668/
----------------
m32r:m32700ut.smp_defconfig
when: Mar 15
why: No rule to make target `arch/m32r/boot/compressed/vmlinux.bin
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884670/
----------------
m68k:allmodconfig
when: Mar 16
why: persistent_ram.c: implicit declaration of 'memblock_reserve'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884324/
ref: http://www.spinics.net/lists/linux-next/msg19343.html
----------------
mips:allmodconfig
when:
why: driver_pci_host.c: implicit declaration of function 'pcibios_enable_device'
status: one of many fixes mips needs...
fix: http://marc.info/?l=linux-wireless&m=133272031621916&w=2
ref: http://patchwork.ozlabs.org/patch/148614/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5807000/
----------------
parisc:allmodconfig
when:
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
parisc64:a500_defconfig
when:
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
------------------
powerpc:allyesconfig
when: May 18 2009, 22:11
why: fat ass kernel with everything simply won't link
status: need to fix build config to ignore the final link
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5806793/
------------------
um:um-defconfig
when: Sep 16 2010, 01:28
why: os-Linux/start_up.c: error: 'PTRACE_SETOPTIONS' undeclared
status: clearly broken forever, so does anyone care?
fix:
ref: http://kisskb.ellerman.id.au/kisskb/target/2979/
^ permalink raw reply
* Re: linux-next: commit "Remove rtd->codec usage from CODEC drivers" breakage.
From: Mark Brown @ 2012-04-10 22:05 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next
In-Reply-To: <4F84A883.3040308@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 340 bytes --]
On Tue, Apr 10, 2012 at 05:39:15PM -0400, Paul Gortmaker wrote:
> Hi Mark,
>
> Can you have a look at this build failure?
>
> sound/soc/codecs/wm9712.c:482:32: error: 'runtime' undeclared (first use in this function)
> sound/soc/codecs/wm9712.c:499:33: error: 'runtime' undeclared (first use in this function)
Already resolved.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: commit "Remove rtd->codec usage from CODEC drivers" breakage.
From: Paul Gortmaker @ 2012-04-10 21:39 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-next
Hi Mark,
Can you have a look at this build failure?
sound/soc/codecs/wm9712.c:482:32: error: 'runtime' undeclared (first use in this function)
sound/soc/codecs/wm9712.c:499:33: error: 'runtime' undeclared (first use in this function)
make[4]: *** [sound/soc/codecs/wm9712.o] Error 1
Full log is here:
http://kisskb.ellerman.id.au/kisskb/buildresult/6087177/
It breaks eseries_pxa_defconfig,em_x270_defconfig
A bisect leads to this commit in linux-next:
--------------------
commit e6968a1719a88afa4708ff43696d6615f0be90be
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Apr 4 15:58:16 2012 +0100
ASoC: codecs: Remove rtd->codec usage from CODEC drivers
In order to support CODEC<->CODEC links remove the assumption that there
is only a single CODEC on a DAI link by removing the use of the CODEC
pointer in the rtd from the CODEC drivers. They are already being passed
their DAI whenever they are passed an rtd and can get the CODEC from
there.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
--------------------
Thanks,
Paul.
git bisect start
# good: [0034102808e0dbbf3a2394b82b1bb40b5778de9e] Linux 3.4-rc2
git bisect good 0034102808e0dbbf3a2394b82b1bb40b5778de9e
# bad: [ef1f1fecd5e7fa274229cd4f30653b4a66a76df4] Add linux-next specific files for 20120410
git bisect bad ef1f1fecd5e7fa274229cd4f30653b4a66a76df4
# good: [25cfb83003f369b9c153eefea97be39085d55936] Merge remote-tracking branch 'sound/for-next'
git bisect good 25cfb83003f369b9c153eefea97be39085d55936
# good: [b62eb966bd66c78a8fc36e566fe0448f879dad60] kvm tools: Move arch-specific cmdline init into kvm__arch_set_cmdline()
git bisect good b62eb966bd66c78a8fc36e566fe0448f879dad60
# good: [911bcb25143c2cbe3daac8785285d8daf03cf9fc] Merge branch 'linus'
git bisect good 911bcb25143c2cbe3daac8785285d8daf03cf9fc
# bad: [5fc4bef34f121f77405c7b4e5aaa485187e8011a] Merge remote-tracking branch 'trivial/for-next'
git bisect bad 5fc4bef34f121f77405c7b4e5aaa485187e8011a
# bad: [c946ebd47232bba219aff0ee2d31bd62c502696a] Merge branch 'quilt/device-mapper'
git bisect bad c946ebd47232bba219aff0ee2d31bd62c502696a
# bad: [c2f6702d318e43bf841da9c0ba5b6f1695661bbc] ASoC: tegra: utils: add support for Tegra30 devices
git bisect bad c2f6702d318e43bf841da9c0ba5b6f1695661bbc
# good: [b46b373f4084cc02d4d41a5a42199fe8462c2f13] ASoC: fsl: assign dma peripheral type according to bus topology
git bisect good b46b373f4084cc02d4d41a5a42199fe8462c2f13
# good: [1d99f2436d0d1c7741d6dfd9d27b5376cdbbca40] ASoC: core: Rework SOC_DOUBLE_R_SX_TLV add SOC_SINGLE_SX_TLV
git bisect good 1d99f2436d0d1c7741d6dfd9d27b5376cdbbca40
# bad: [063dd9d4488184f35c4598fb68f46fbba959d58e] ASoC: tegra: drop Kconfig description for SND_SOC_TEGRA_DAS
git bisect bad 063dd9d4488184f35c4598fb68f46fbba959d58e
# good: [149c53b514d0a42abbb2c9611ffc9fa2d94857e8] ASoC: wm8994: Don't bother updating the jackdet mode needlessly
git bisect good 149c53b514d0a42abbb2c9611ffc9fa2d94857e8
# good: [5c7b4a08b7f3ce49756b79386dcdad5a2a21ccb6] ASoC: fsl: remove redundant Kconfig dependency on SND_SOC_POWERPC_DMA
git bisect good 5c7b4a08b7f3ce49756b79386dcdad5a2a21ccb6
# bad: [e6968a1719a88afa4708ff43696d6615f0be90be] ASoC: codecs: Remove rtd->codec usage from CODEC drivers
git bisect bad e6968a1719a88afa4708ff43696d6615f0be90be
# good: [fc9a30e85e4a9df7e692eda45b8484fc028238f0] ASoC: tlv320aic23: Remove driver-specific version number
git bisect good fc9a30e85e4a9df7e692eda45b8484fc028238f0
^ permalink raw reply
* Re: linux-next: build failure after merge of the pinctrl tree
From: Stephen Warren @ 2012-04-10 15:12 UTC (permalink / raw)
To: Linus Walleij; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <CACRpkdY57hQOvpqxaaYyJoH0ewfOAj9RqzWtC=aOWQyNMoG6fg@mail.gmail.com>
On 04/10/2012 01:42 AM, Linus Walleij wrote:
> On Wed, Apr 4, 2012 at 5:43 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
>> On 04/03/2012 08:44 PM, Stephen Rothwell wrote:
>>> Hi Linus,
>>>
>>> After merging the pinctrl tree, today's linux-next build (powerpc
>>> ppc64_defconfig) failed like this:
>>>
>>> drivers/pinctrl/devicetree.c: In function 'dt_free_map':
>>> drivers/pinctrl/devicetree.c:44:42: error: dereferencing pointer to
>>> incomplete type drivers/pinctrl/devicetree.c:45:6: error:
>>> dereferencing pointer to incomplete type
>>> drivers/pinctrl/devicetree.c: In function 'dt_to_map_one_config':
>>> drivers/pinctrl/devicetree.c:140:21: error: dereferencing pointer
>>> to incomplete type drivers/pinctrl/devicetree.c:141:10: error:
>>> dereferencing pointer to incomplete type
>>> drivers/pinctrl/devicetree.c:146:11: error: dereferencing pointer
>>> to incomplete type
>>
>> This doesn't repro for me with tegra_defconfig, which has both
>> CONFIG_PINCTRL and CONFIG_OF enabled.
>>
>> I believe this happens because of the following in
>> drivers/pinctrl/Makefile:
>>
>> obj-$(CONFIG_OF) += devicetree.o
>>
>> On ppc64, CONFIG_OF is probably true, yet the rest of PINCTRL isn't
>> enabled, hence the headers that are included probably don't declare
>> all the types needed to compile that file.
>>
>> In fact, the file shouldn't be compiled, since it's not needed if
>> !CONFIG_PINCTRL. So perhaps the Makefile should be more like:
>>
>> ifeq ($(CONFIG_OF),y)
>> obj-$(CONFIG_PINCTRL) += devicetree.o
>> endif
>
> Easiest fixed with a new Kconfig like CONFIG_PINCTRL_OF that
> depend on both right?
>
> I'll cook a patch.
I don't think so; why wouldn't pinctrl automatically have DT support
when both pinctrl and OF are enabled. BTW, I already posted a patch to
fix this last week.
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (net-next tree related)
From: David Miller @ 2012-04-10 13:26 UTC (permalink / raw)
To: sfr; +Cc: netdev, linux-next, linux-kernel, msink, schwidefsky,
heiko.carstens
In-Reply-To: <20120410152923.15aee4df478d819f167cd4af@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 Apr 2012 15:29:23 +1000
> After merging the final tree, today's linux-next build (s390 allmodconfig)
> failed like this:
I just checked in the following which will hopefully cure this,
thanks:
--------------------
wiznet: Fix Kconfig dependencies.
Both drivers need to depend upon HAS_IOMEM, otherwise we
get a build failure on platforms like S390.
All the driver specific config options need to depend upon
the drivers themselves.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/wiznet/Kconfig | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/wiznet/Kconfig b/drivers/net/ethernet/wiznet/Kconfig
index 2bb383c..c8291bf 100644
--- a/drivers/net/ethernet/wiznet/Kconfig
+++ b/drivers/net/ethernet/wiznet/Kconfig
@@ -19,6 +19,7 @@ if NET_VENDOR_WIZNET
config WIZNET_W5100
tristate "WIZnet W5100 Ethernet support"
+ depends on HAS_IOMEM
---help---
Support for WIZnet W5100 chips.
@@ -31,6 +32,7 @@ config WIZNET_W5100
config WIZNET_W5300
tristate "WIZnet W5300 Ethernet support"
+ depends on HAS_IOMEM
---help---
Support for WIZnet W5300 chips.
@@ -43,6 +45,7 @@ config WIZNET_W5300
choice
prompt "WIZnet interface mode"
+ depends on WIZNET_W5100 || WIZNET_W5300
default WIZNET_BUS_ANY
config WIZNET_BUS_DIRECT
@@ -69,6 +72,7 @@ endchoice
config WIZNET_TX_FLOW
bool "Use transmit flow control"
+ depends on WIZNET_W5100 || WIZNET_W5300
default y
help
This enables transmit flow control for WIZnet chips.
--
1.7.7.6
^ permalink raw reply related
* Re: [PATCH] pinctrl: fix build when CONFIG_OF && !CONFIG_PINCTRL
From: Linus Walleij @ 2012-04-10 8:53 UTC (permalink / raw)
To: Stephen Warren; +Cc: sfr, linux-kernel, linux-next, Stephen Warren
In-Reply-To: <1333511636-9987-1-git-send-email-swarren@wwwdotorg.org>
On Wed, Apr 4, 2012 at 5:53 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> pinctrl/devicetree.c won't compile when !CONFIG_PINCTRL, since the
> pinctrl headers don't declare some types when !PINCTRL. Make sure
> pinctrl/Makefile only attempts to compile devicetree.c when OF &&
> PINCTRL.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
I fixed this other Kconfig patch to address the same problem.
If you think this approach is better let me know...
Yours,
Linus Walleij
^ permalink raw reply
* Re: linux-next: build failure after merge of the pinctrl tree
From: Linus Walleij @ 2012-04-10 7:42 UTC (permalink / raw)
To: Stephen Warren; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <4F7BC36E.4070000@wwwdotorg.org>
On Wed, Apr 4, 2012 at 5:43 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 04/03/2012 08:44 PM, Stephen Rothwell wrote:
>> Hi Linus,
>>
>> After merging the pinctrl tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> drivers/pinctrl/devicetree.c: In function 'dt_free_map':
>> drivers/pinctrl/devicetree.c:44:42: error: dereferencing pointer to
>> incomplete type drivers/pinctrl/devicetree.c:45:6: error:
>> dereferencing pointer to incomplete type
>> drivers/pinctrl/devicetree.c: In function 'dt_to_map_one_config':
>> drivers/pinctrl/devicetree.c:140:21: error: dereferencing pointer
>> to incomplete type drivers/pinctrl/devicetree.c:141:10: error:
>> dereferencing pointer to incomplete type
>> drivers/pinctrl/devicetree.c:146:11: error: dereferencing pointer
>> to incomplete type
>
> This doesn't repro for me with tegra_defconfig, which has both
> CONFIG_PINCTRL and CONFIG_OF enabled.
>
> I believe this happens because of the following in
> drivers/pinctrl/Makefile:
>
> obj-$(CONFIG_OF) += devicetree.o
>
> On ppc64, CONFIG_OF is probably true, yet the rest of PINCTRL isn't
> enabled, hence the headers that are included probably don't declare
> all the types needed to compile that file.
>
> In fact, the file shouldn't be compiled, since it's not needed if
> !CONFIG_PINCTRL. So perhaps the Makefile should be more like:
>
> ifeq ($(CONFIG_OF),y)
> obj-$(CONFIG_PINCTRL) += devicetree.o
> endif
Easiest fixed with a new Kconfig like CONFIG_PINCTRL_OF that
depend on both right?
I'll cook a patch.
Yours,
Linus Walleij
^ permalink raw reply
* Re: [PATCH] gianfar: add missing include
From: Michael Neuling @ 2012-04-10 6:41 UTC (permalink / raw)
To: Richard Cochran; +Cc: David S. Miller, linuxppc-dev, netdev, linux-next
In-Reply-To: <20120410063641.GA10025@localhost.localdomain>
Richard Cochran <richardcochran@gmail.com> wrote:
> On Tue, Apr 10, 2012 at 02:18:47PM +1000, Michael Neuling wrote:
> > This is because of a missing include file from:
> > 6663628 gianfar: Support the get_ts_info ethtool method.
> >
> > Signed-off-by: Michael Neuling <mikey@neuling.org>
>
> I did a poor job testing the non-x86 stuff in this series. Thanks for
> the fix.
>
> Acked-by: Richard Cochran <richardcochran@gmail.com>
Looks like davem fixed it before my post anyway...
http://git.kernel.org/?p=linux/kernel/git/davem/net-next.git;a=commitdiff;h=65a85a8d4dcabe95587ab61bece38b8d58174043
This is in next-20120410.
Sorry for the noise.
Mikey
^ permalink raw reply
* Re: [PATCH] gianfar: add missing include
From: Richard Cochran @ 2012-04-10 6:36 UTC (permalink / raw)
To: Michael Neuling; +Cc: David S. Miller, linuxppc-dev, netdev, linux-next
In-Reply-To: <25411.1334031527@neuling.org>
On Tue, Apr 10, 2012 at 02:18:47PM +1000, Michael Neuling wrote:
> This is because of a missing include file from:
> 6663628 gianfar: Support the get_ts_info ethtool method.
>
> Signed-off-by: Michael Neuling <mikey@neuling.org>
I did a poor job testing the non-x86 stuff in this series. Thanks for
the fix.
Acked-by: Richard Cochran <richardcochran@gmail.com>
^ permalink raw reply
* linux-next: build failure after merge of the final tree (net-next tree related)
From: Stephen Rothwell @ 2012-04-10 5:29 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Mike Sinkovsky, Martin Schwidefsky,
Heiko Carstens
[-- Attachment #1: Type: text/plain, Size: 1058 bytes --]
Hi all,
After merging the final tree, today's linux-next build (s390 allmodconfig)
failed like this:
drivers/net/ethernet/wiznet/w5100.c: In function 'w5100_read_direct':
drivers/net/ethernet/wiznet/w5100.c:121:2: error: implicit declaration of function 'ioread8' [-Werror=implicit-function-declaration]
drivers/net/ethernet/wiznet/w5100.c: In function 'w5100_write_direct':
drivers/net/ethernet/wiznet/w5100.c:127:2: error: implicit declaration of function 'iowrite8' [-Werror=implicit-function-declaration]
drivers/net/ethernet/wiznet/w5100.c: In function 'w5100_read_indirect':
drivers/net/ethernet/wiznet/w5100.c:188:2: error: implicit declaration of function 'mmiowb' [-Werror=implicit-function-declaration]
drivers/net/ethernet/wiznet/w5100.c: In function 'w5100_hw_probe':
drivers/net/ethernet/wiznet/w5100.c:680:6: error: 'IRQ_TYPE_LEVEL_LOW' undeclared (first use in this function)
Caused by commit 8b1467a31343 ("Ethernet driver for the WIZnet W5100 chip").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for Apr 10
From: Stephen Rothwell @ 2012-04-10 5:12 UTC (permalink / raw)
To: linux-next; +Cc: LKML
In-Reply-To: <20120410145546.65b54b0d515db38e23bb4624@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 790 bytes --]
On Tue, 10 Apr 2012 14:55:46 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Changes since 20120405:
>
> New trees: sh-current, sh
>
> The tile tree gained conflicts against Linus' tree.
>
> The net-next tree lost its build failure.
>
> The wireless-next tree gained a conflict against the net-next tree.
>
> The trivial tree lost its conflict.
The regulator tree gained a build failure so I used the version from
next-20120405.
> The tty tree gained a build failure so I used the version from
> next-20120405.
>
> The pinctrl tree still had its build failure so I used the version from
> next-20120403.
>
> The akpm tree lost several patches that turned up in Linus' tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the regulator tree
From: Stephen Rothwell @ 2012-04-10 3:01 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 744 bytes --]
Hi all,
After merging the regulator tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/regulator/ab8500.c: In function 'ab8500_regulator_probe':
drivers/regulator/ab8500.c:783:9: error: invalid type argument of '->' (have 'struct regulator_config')
drivers/regulator/ab8500.c:784:9: error: invalid type argument of '->' (have 'struct regulator_config')
drivers/regulator/ab8500.c:785:9: error: invalid type argument of '->' (have 'struct regulator_config')
Caused by commit c172708d38a4 ("regulator: core: Use a struct to pass in
regulator runtime configuration").
I have used the regulator tree from next-20120405 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: Tree for Apr 10
From: Stephen Rothwell @ 2012-04-10 4:55 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 26568 bytes --]
Hi all,
Changes since 20120405:
New trees: sh-current, sh
The tile tree gained conflicts against Linus' tree.
The net-next tree lost its build failure.
The wireless-next tree gained a conflict against the net-next tree.
The trivial tree lost its conflict.
The tty tree gained a build failure so I used the version from
next-20120405.
The pinctrl tree still had its build failure so I used the version from
next-20120403.
The akpm tree lost several patches that turned up in Linus' tree.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). 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).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 186 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (0034102 Linux 3.4-rc2)
Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
Merging kbuild-current/rc-fixes (0eb043d Subject: [PATCH] tags.sh: Add missing quotes)
Merging arm-current/fixes (6d00889 ARM: fix more fallout from 9f97da78bf (Disintegrate asm/system.h for ARM))
Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices)
Merging powerpc-merge/merge (9b218f6 powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current_state() wart)
Merging sparc/master (ca6f327 serial/sunzilog: fix keyboard on SUN SPARCstation)
Merging scsi-rc-fixes/master (41f8ad7 [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576)
Merging net/master (f68e556 Make the "word-at-a-time" helper functions more commonly usable)
Merging sound-current/for-linus (c38f62b Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging wireless/master (7ab2485b net/wireless/wext-core.c: add missing kfree)
Merging driver-core.current/driver-core-linus (70fa4a6 sysfs: Update the name hash for an entry after changing the namespace)
Merging tty.current/tty-linus (11bbd5b pch_uart: Add Kontron COMe-mTT10 uart clock quirk)
Merging usb.current/usb-linus (b446b96 UHCI: hub_status_data should indicate if ports are resuming)
Merging staging.current/staging-linus (0034102 Linux 3.4-rc2)
Merging char-misc.current/char-misc-linus (0034102 Linux 3.4-rc2)
Merging cpufreq-current/fixes (6139b65 Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes)
Merging input-current/for-linus (d626dad Input: sentelic - filter taps in absolute mode)
Merging md-current/for-linus (5020ad7 md/raid1,raid10: don't compare excess byte during consistency check.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (511d63c crypto: talitos - properly lock access to global talitos registers)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (691c01c arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq are compatible)
Merging irqdomain-current/irqdomain/merge (d4886bc irqdomain/powerpc: updated defconfigs for VIRQ_DEBUG rename)
Merging devicetree-current/devicetree/merge (31134ef dt: Linux DT usage model documentation)
Merging spi-current/spi/merge (cc4d22a spi/imx: mark base member in spi_imx_data as __iomem)
Merging gpio-current/gpio/merge (d7ce1db gpio/sodaville: Convert sodaville driver to new irqdomain API)
Merging arm/for-next (6d00889 ARM: fix more fallout from 9f97da78bf (Disintegrate asm/system.h for ARM))
Merging arm-perf/for-next/perf (c16fa4f Linux 3.3)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (e62a334 Merge branch 'v3.4-cpufreq-exynos-fixes' into for-next)
Merging tegra/for-next (4a3398e gpio: tegra: Iterate over the correct number of banks)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (35fe2e7 blackfin: update defconfig for bf527-ezkit)
Merging c6x/for-linux-next (fde7d90 Linux 3.3-rc7)
Merging cris/for-next (4d5914d cris/mm/fault.c: Port OOM changes to do_page_fault)
Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
Merging ia64/next (16f2634 [IA64] Normalize return value of chip->irq_set_affinity() method)
Merging m68k/for-next (25d0b90 scsi/atari: Make more functions static)
Merging m68knommu/for-next (de6bd4f m68k: merge the MMU and non-MMU signal.c code)
Merging microblaze/next (0dd90aa microblaze: Fix ret_from_fork declaration)
Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' into mips-for-linux-next)
Merging openrisc/for-upstream (c88e692 asm-generic: add linux/types.h to cmpxchg.h)
Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next)
Merging powerpc/next (0195c00 Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system)
Merging 4xx/next (b5594a7 powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board)
Merging mpc5xxx/next (7b6bb64 powerpc/5200: convert mpc5200 to use of_platform_populate())
Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0)
Merging s390/features (b7918da [S390] update default configuration)
Merging sh/sh-latest (bbb4ce5 serial: sh-sci: modify sci_break_ctl())
Merging sparc-next/master (e9b57cc sparc: Use vsprintf extention %pf with builtin_return_address)
Merging tile/master (a6a18aa arch/tile: add descriptive text if the kernel reports a bad trap)
CONFLICT (content): Merge conflict in arch/tile/kernel/stack.c
CONFLICT (content): Merge conflict in arch/tile/kernel/single_step.c
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (c666601 rbd: move snap_rwsem to the device, rename to header_rwsem)
Merging cifs/master (f68e556 Make the "word-at-a-time" helper functions more commonly usable)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
Merging ext3/for_next (c2d9fae ext2: Remove s_dirt handling)
Merging ext4/dev (9d547c3 vfs: remove unused superblock helpers)
Merging fuse/for-next (4273b79 fuse: O_DIRECT support for files)
Merging gfs2/master (779ac58 GFS2: Make sure rindex is uptodate before starting transactions)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (f30fb85 NFS: check for req==NULL in nfs_try_to_update_request cleanup)
Merging nfsd/nfsd-next (797a9d7 nfsd: only register cld pipe notifier when CONFIG_NFSD_V4 is enabled)
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (01627d9 Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux)
Merging ubifs/linux-next (dd775ae Linux 3.4-rc1)
Merging xfs/for-next (5a5881c xfs: add lots of attribute trace points)
Merging vfs/for-next (07c0c5d ext4: initialization of ext4_li_mtx needs to be done earlier)
Merging pci/next (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging hid/for-next (2c8cee0 Merge branches 'logitech', 'wacom' and 'waltop' into for-next)
Merging quilt/i2c (85bb1a8 i2c-dev: Add support for I2C_M_RECV_LEN)
Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
Merging i2c-embedded/i2c-embedded/for-next (bbceeee i2c-eg20t: Remove write-only variables)
Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (e0367870 hwmon: use module_pci_driver)
Merging v4l-dvb/master (866c386 Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (51cbc3e Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (b8cec3c pata_cmd64x: implement sff_irq_check() method)
Merging infiniband/for-next (dd775ae Linux 3.4-rc1)
Merging acpi/next (eeaab2d Merge branches 'idle-fix' and 'misc' into release)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (19f8399 Merge branch 'iso-flush' into for-next)
Merging ubi/linux-next (cc83146 UBI: rename MOVE_CANCEL_BITFLIPS to MOVE_TARGET_BITFLIPS)
Merging dlm/next (1b189b8 dlm: last element of dlm_local_addr[] never used)
Merging scsi/master (6993169 [SCSI] ipr: Driver version 2.5.3)
Merging target-updates/for-next (187e70a ib_srpt: Fix srpt_handle_cmd send_ioctx->ioctx_kref leak on exception)
Merging target-merge/for-next-merge (06de5ee tcm_qla2xxx: Add >= 24xx series fabric module for target-core)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (fbabacb Merge branches 'devel', 'rnc-devel' and 'fixes' into all)
Merging slave-dma/next (91ae1e3 dmaengine: mxs-dma: assign cookie in prepare)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (2f6f9d6 fealnx: Remove unused local label 'out' in netdev_open().)
Merging wireless-next/master (47107e8 iwlwifi: split POWER_PMI status bit)
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-testmode.c
Merging bluetooth/master (30720c9 Bluetooth: Adds set_default function in L2CAP setup)
Merging mtd/master (7b0e67f mtd: docg3 add protection against concurrency)
Merging l2-mtd/master (711ab3a sh: Use the plat_nand default partition parser)
Merging crypto/master (d788fec crypto, xor: Sanitize checksumming function selection output)
Merging sound/for-next (251d89d Merge branch 'for-linus' into for-next)
Merging sound-asoc/for-next (a8188c0 Merge branch 'for-3.5' into asoc-next)
Merging cpufreq/next (a7b422c provide disable_cpufreq() function to disable the API.)
Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.)
CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c
CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c
Merging input/next (98a8413 Input: gameport - use module_gameport_driver)
Merging input-mt/for-next (7491f3d bcm5974: Add pointer and buttonpad properties)
Merging cgroup/for-next (48ddbe1 cgroup: make css->refcnt clearing on cgroup removal optional)
Merging block/for-next (f52b69f Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh)
Merging quilt/device-mapper (4b63eba This device-mapper target creates a read-only device that transparently validates the data on one underlying device against a pre-generated tree of cryptographic checksums stored on a second device.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (86ae21d mmc: omap_hsmmc: Cleanup use of cpu_is_* for debounce_clock)
Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
Merging slab/for-next (b80b6c0 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (bee6cd3 md/raid10: add reshape support)
Merging mfd/for-next (b8589e2 gpio/twl: Add DT support to gpio-twl4030 driver)
Merging battery/master (5cdd4d7 max17042_battery: Clean up interrupt handling)
Merging drm/drm-next (5466c7b drm/i915: use DDC_ADDR instead of hard-coding it)
Merging fbdev/fbdev-next (688ec34 video: pxa3xx-gcu: Simplify the logic to exit while loop in pxa3xx_gcu_wait_idle)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (df01d53 OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update)
Merging regulator/for-next (c2cb39b Merge branch 'regulator-drivers' into regulator-next)
$ git reset --hard HEAD^
Merging refs/next/20120405/regulator
Merging security/next (9ccf010 maintainers: update wiki url for the security subsystem)
Merging selinux/master (ecf093d SELinux: add default_type statements)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (0034102 Linux 3.4-rc2)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (7de4730 Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next)
Merging osd/linux-next (72749a2 exofs: Cap on the memcpy() size)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (e75d660 Merge branch 'master' into for-next)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (c4772d1 PM / QoS: add pm_qos_update_request_timeout() API)
Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
Merging edac/linux_next (a4b4be3 edac: rename channel_info to rank_info)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries)
Merging spi/spi/next (3d414f3 Merge branch 'spi' of git://gitorious.org/linus-tree/linus-tree into spi/next)
Merging tip/auto-latest (911bcb2 Merge branch 'linus')
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging rcu/rcu/next (1cc8596 rcu: Stop spurious warnings from synchronize_sched_expedited)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3)
Merging kvm/linux-next (e087592 KVM: Resolve RCU vs. async page fault problem)
Merging oprofile/for-next (c16fa4f Linux 3.3)
Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h
Merging xen-two/linux-next (2efe928 Merge branch 'stable/for-linus-3.4' into linux-next)
CONFLICT (content): Merge conflict in arch/x86/kernel/apic/io_apic.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/io_apic.h
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (adb7950 percpu: fix __this_cpu_{sub,inc,dec}_return() definition)
Merging workqueues/for-next (e06ffa1 workqueue: use percpu allocator for cwq on UP)
Merging drivers-x86/linux-next (86924de acer-wmi: add quirk table for video backlight vendor mode)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (41326c1 Merge branch 'regmap-mmio' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (ecf1948 w1: fix slave driver registration error message)
Merging tty/tty-next (c56a00a tty: hold lock across tty buffer finding and buffer filling)
$ git reset --hard HEAD^
Merging refs/next/20120405/tty
Merging usb/usb-next (0034102 Linux 3.4-rc2)
Merging staging/staging-next (0034102 Linux 3.4-rc2)
Merging char-misc/char-misc-next (0034102 Linux 3.4-rc2)
Merging tmem/linux-next (9c9fc31 Merge commit 'e22057c8599373e5caef0bc42bdb95d2a361ab0d' into linux-next)
Merging writeback/writeback-for-next (697e6fe writeback: Remove outdated comment)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (8cfa831 pinctrl: replace list_*() with get_*_count())
$ git reset --hard HEAD^
Merging refs/next/20120403/pinctrl
Merging moduleh/for-sfr (ed93e94 ia64: populate the cmpxchg header with appropriate code)
Merging vhost/linux-next (437578b virtio-pci: switch to PM ops macro to initialise PM functions)
Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/)
Merging irqdomain/irqdomain/next (409a6f6 Merge branch 'irqdomain-for-grant' of git://sources.calxeda.com/kernel/linux into irqdomain/next)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging gpio/gpio/next (c77c8a6 gpio/ep93xx: Remove unused inline function and useless pr_err message)
Merging arm-soc/for-next (ce9f68e Merge branch 'fixes' into for-next)
Merging kvmtool/master (63091b3 kvm tools: Drop unnecessary headers in barrier.h)
Merging dma-mapping/dma-mapping-next (5d32c88 Merge branch 'akpm' (Andrew's patch-bomb))
Merging dma-buf/for-next (9f28056 dma-buf: Correct dummy function declarations.)
CONFLICT (content): Merge conflict in include/linux/dma-buf.h
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging cpuidle-cons/cpuidle_consol_pull (203b52e SH: shmobile: Consolidate time keeping and irq enable)
CONFLICT (content): Merge conflict in include/linux/cpuidle.h
CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/cpuidle.c
CONFLICT (add/add): Merge conflict in arch/arm/include/asm/cpuidle.h
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
Applying: drivers/xen/Kconfig: fix Kconfig layout
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: avr32: don't mask signals in the error path
Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
Applying: avr32: use block_sigmask()
Applying: m32r: use set_current_blocked() and block_sigmask()
Applying: m68k: use set_current_blocked() and block_sigmask()
Applying: mn10300: use set_current_blocked() and block_sigmask()
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: cris: select GENERIC_ATOMIC64
Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
Applying: x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix
Applying: x86: change percpu_read_stable() to this_cpu_read_stable()
Applying: net: use this_cpu_xxx replace percpu_xxx funcs
Applying: percpu: remove percpu_xxx() functions
Applying: percpu-remove-percpu_xxx-functions-fix
Applying: ia64: use set_current_blocked() and block_sigmask()
Applying: microblaze: don't reimplement force_sigsegv()
Applying: microblaze: no need to reset handler if SA_ONESHOT
Applying: microblaze: fix signal masking
Applying: microblaze: use set_current_blocked() and block_sigmask()
Applying: MIPS: use set_current_blocked() and block_sigmask()
Applying: score: don't mask signals if we fail to setup signal stack
Applying: score: use set_current_blocked() and block_sigmask()
Applying: h8300: use set_current_blocked() and block_sigmask()
Applying: unicore32: use block_sigmask()
Applying: blackfin: use set_current_blocked() and block_sigmask()
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: vfs: increment iversion when a file is truncated
Applying: fs: symlink restrictions on sticky directories
Applying: fs: hardlink creation restrictions
Applying: brlocks/lglocks: cleanups
Applying: mm/memory_failure: let the compiler add the function name
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: memcg: fix/change behavior of shared anon at moving task
Applying: memcg swap: mem_cgroup_move_swap_account never needs fixup
Applying: memcg swap: use mem_cgroup_uncharge_swap()
Applying: mm/memcg: scanning_global_lru means mem_cgroup_disabled
Applying: mm/memcg: move reclaim_stat into lruvec
Applying: mm: push lru index into shrink_[in]active_list()
Applying: mm-push-lru-index-into-shrink_active_list-fix
Applying: mm: mark mm-inline functions as __always_inline
Applying: mm: remove lru type checks from __isolate_lru_page()
Applying: mm/memcg: kill mem_cgroup_lru_del()
Applying: mm/memcg: use vm_swappiness from target memory cgroup
Applying: security/keys/keyctl.c: suppress memory allocation failure warning
Applying: frv: use set_current_blocked() and block_sigmask()
Applying: um/kernel/trap.c: port OOM changes to handle_page_fault()
Applying: block: use lockdep_assert_held() for queue locking
Applying: sgi-xp: use lockdep_assert_held()
Applying: drivers/scsi/aha152x.c: remove broken usage of spin_is_locked()
Applying: XFS: fix lock ASSERT on UP
Applying: mm/huge_memory.c: use lockdep_assert_held()
Applying: futex: use lockdep_assert_held() for lock checking
Applying: drivers/net/irda/sir_dev.c: remove spin_is_locked()
Applying: drivers/net/ethernet/smsc/smsc911x.h: use lockdep_assert_held() instead of home grown buggy construct
Applying: spinlocks.txt: add a discussion on why spin_is_locked() is bad
Applying: spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix
Applying: include/linux/spinlock.h: add a kerneldoc comment to spin_is_locked() that discourages its use
Applying: checkpatch: check for spin_is_locked()
Applying: vsprintf: further optimize decimal conversion
Applying: vsprintf-further-optimize-decimal-conversion-v2
Applying: vsprintf-further-optimize-decimal-conversion-checkpatch-fixes
Applying: leds: add LED driver for lm3556 chip
Applying: leds-add-led-driver-for-lm3556-chip-fix-2
Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes
Applying: leds-add-led-driver-for-lm3556-chip-fix
Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
Applying: rtc/spear: add Device Tree probing capability
Applying: kmod: unexport call_usermodehelper_freeinfo()
Applying: kmod: convert two call sites to call_usermodehelper_fns()
Applying: kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
Applying: kmod: avoid deadlock from recursive kmod call
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: rapidio: add DMA engine support for RIO data transfers
Applying: rapidio/tsi721: add DMA engine support
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: syscalls, x86: add __NR_kcmp syscall
Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
Applying: c/r: prctl: add ability to set new mm_struct::exe_file
Applying: c-r-prctl-add-ability-to-set-new-mm_struct-exe_file-v2
Applying: c/r: prctl: add ability to get clear_tid_address
Applying: c-r-prctl-add-ability-to-get-clear_tid_address-fix
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: notify_change(): check that i_mutex is held
Merging akpm (949e4ed notify_change(): check that i_mutex is held)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH] gianfar: add missing include
From: Michael Neuling @ 2012-04-10 4:18 UTC (permalink / raw)
To: David S. Miller, Richard Cochran; +Cc: linuxppc-dev, netdev, linux-next
next-20120405 compiled with mpc85xx_defconfig gives the following:
CC drivers/net/ethernet/freescale/gianfar_ethtool.o
drivers/net/ethernet/freescale/gianfar_ethtool.c: In function 'gfar_get_ts_info':
drivers/net/ethernet/freescale/gianfar_ethtool.c:1751:4: error: 'SOF_TIMESTAMPING_RX_SOFTWARE' undeclared (first use in this function)
drivers/net/ethernet/freescale/gianfar_ethtool.c:1751:4: note: each undeclared identifier is reported only once for each function it appears in
drivers/net/ethernet/freescale/gianfar_ethtool.c:1752:4: error: 'SOF_TIMESTAMPING_SOFTWARE' undeclared (first use in this function)
drivers/net/ethernet/freescale/gianfar_ethtool.c:1757:3: error: 'SOF_TIMESTAMPING_TX_HARDWARE' undeclared (first use in this function)
drivers/net/ethernet/freescale/gianfar_ethtool.c:1758:3: error: 'SOF_TIMESTAMPING_RX_HARDWARE' undeclared (first use in this function)
drivers/net/ethernet/freescale/gianfar_ethtool.c:1759:3: error: 'SOF_TIMESTAMPING_RAW_HARDWARE' undeclared (first use in this function)
drivers/net/ethernet/freescale/gianfar_ethtool.c:1762:9: error: 'HWTSTAMP_TX_OFF' undeclared (first use in this function)
drivers/net/ethernet/freescale/gianfar_ethtool.c:1763:9: error: 'HWTSTAMP_TX_ON' undeclared (first use in this function)
drivers/net/ethernet/freescale/gianfar_ethtool.c:1765:9: error: 'HWTSTAMP_FILTER_NONE' undeclared (first use in this function)
drivers/net/ethernet/freescale/gianfar_ethtool.c:1766:9: error: 'HWTSTAMP_FILTER_ALL' undeclared (first use in this function)
This is because of a missing include file from:
6663628 gianfar: Support the get_ts_info ethtool method.
Signed-off-by: Michael Neuling <mikey@neuling.org>
CC: Richard Cochran <richardcochran@gmail.com>
CC: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
index 27f49c7..3c34b32b 100644
--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -29,6 +29,7 @@
#include <linux/skbuff.h>
#include <linux/spinlock.h>
#include <linux/mm.h>
+#include <linux/net_tstamp.h>
#include <asm/io.h>
#include <asm/irq.h>
^ permalink raw reply related
* linux-next: build failure after merge of the tty tree
From: Stephen Rothwell @ 2012-04-10 3:06 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Jiri Slaby, Karsten Keil
[-- Attachment #1: Type: text/plain, Size: 474 bytes --]
Hi Greg,
After merging the tty tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
ERROR: "isdn_tty_revision" [drivers/isdn/i4l/isdn.ko] undefined!
Presumably caused by commit 1ca6711ec001 ("ISDN: i4l, remove cvs crap").
That variable is still referenced in drivers/isdn/i4l/isdn_common.c. Grep
is your friend.
I have used the tty tree from next-20120405 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ 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