Hi all,
Changes since 20101209:
The v4l-dvb tree still has its build failure for which I applied a patch.
The acpi tree still has its build failure so I used the version from
next-20101201.
The net tree lost its build failure.
The tip tree lost its build failures.
The percpu tree gained a conflict against the tip 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/v2.6/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 181 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.
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 [email protected]
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/rc-fixes
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig
Applying: rmobile: merge fixup for clkdev changes
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in drivers/pci/pci-sysfs.c
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
Applying: media: const and __devinitdata do not mix
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
$ git reset --hard HEAD^
Merging refs/next/20101201/acpi
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging wireless/master
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/Makefile
Merging mtd/master
Merging crypto/master
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/soc/sh/fsi.c
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/core.c
Merging security-testing/next
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c
Merging audit/for-next
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
Merging swiotlb-xen/master
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
CONFLICT (delete/modify): arch/x86/kernel/apic/nmi.c deleted in HEAD and modified in percpu/for-next. Version percpu/for-next of arch/x86/kernel/apic/nmi.c left in tree.
$ git rm -f arch/x86/kernel/apic/nmi.c
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
CONFLICT (content): Merge conflict in arch/sh/Kconfig
CONFLICT (content): Merge conflict in drivers/usb/musb/blackfin.c
Merging staging/staging-next
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c
CONFLICT (content): Merge conflict in include/linux/hardirq.h
CONFLICT (content): Merge conflict in include/linux/smp_lock.h
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in fs/ocfs2/super.c
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
On Fri, 10 Dec 2010 13:57:46 +1100 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20101209:
arch/x86/kernel/apic/hw_nmi.c:28: error: redefinition of 'touch_nmi_watchdog'
include/linux/nmi.h:22: note: previous definition of 'touch_nmi_watchdog' was here
kernel config is attached.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
On Fri, Dec 10, 2010 at 11:25 PM, Randy Dunlap <[email protected]> wrote:
> On Fri, 10 Dec 2010 13:57:46 +1100 Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20101209:
>
>
> arch/x86/kernel/apic/hw_nmi.c:28: error: redefinition of 'touch_nmi_watchdog'
> include/linux/nmi.h:22: note: previous definition of 'touch_nmi_watchdog' was here
>
Hello Randy,
Please checkout the following patch. Does it work?
----
x86: Fix kernel build in hw_nmi.c when CONFIG_HARDLOCKUP_DETECTOR=n.
This patch fixes kernel build introduced by commit
96a84c20d635fb1e98ab92f9fc517c4441f5c424. That commit supposed to
define touch_nmi_watchdog when CONFIG_HARDLOCKUP_DETECTOR=y in
hw_nmi.c. But mistakenly defines touch_nmi_watchdog when
CONFIG_HARDLOCKUP_DETECTOR=n in hw_nmi.c.
arch/x86/kernel/apic/hw_nmi.c:28: error: redefinition of ?touch_nmi_watchdog?
include/linux/nmi.h:23: error: previous definition of
?touch_nmi_watchdog? was here
Signed-off-by: Rakib Mullick <[email protected]>
---
diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
index c558e11..2056569 100644
--- a/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@ -24,7 +24,7 @@ u64 hw_nmi_get_sample_period(void)
}
#endif
-#ifndef CONFIG_HARDLOCKUP_DETECTOR
+#ifdef CONFIG_HARDLOCKUP_DETECTOR
void touch_nmi_watchdog(void)
{
touch_softlockup_watchdog();
On Sun, Dec 12, 2010 at 11:27 AM, Rakib Mullick <[email protected]> wrote:
> On Fri, Dec 10, 2010 at 11:25 PM, Randy Dunlap <[email protected]> wrote:
>> On Fri, 10 Dec 2010 13:57:46 +1100 Stephen Rothwell wrote:
>>
>>> Hi all,
>>>
>>> Changes since 20101209:
>>
>>
>> arch/x86/kernel/apic/hw_nmi.c:28: error: redefinition of 'touch_nmi_watchdog'
>> include/linux/nmi.h:22: note: previous definition of 'touch_nmi_watchdog' was here
>>
> Hello Randy,
>
> Please checkout the following patch. Does it work?
> ----
>
> x86: Fix kernel build in hw_nmi.c when CONFIG_HARDLOCKUP_DETECTOR=n.
>
> This patch fixes kernel build introduced by commit
> 96a84c20d635fb1e98ab92f9fc517c4441f5c424. That commit supposed to
> define touch_nmi_watchdog when CONFIG_HARDLOCKUP_DETECTOR=y in
> hw_nmi.c. But mistakenly defines touch_nmi_watchdog when
> CONFIG_HARDLOCKUP_DETECTOR=n in hw_nmi.c.
>
> arch/x86/kernel/apic/hw_nmi.c:28: error: redefinition of ?touch_nmi_watchdog?
> include/linux/nmi.h:23: error: previous definition of
> ?touch_nmi_watchdog? was here
>
NO. I don't think this is the correct one. Cause we don't want
touch_softlockup_watchdog() to be called if
CONFIG_HARDLOCKUP_DETECTOR=y.
> Signed-off-by: Rakib Mullick <[email protected]>
> ---
>
> diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
> index c558e11..2056569 100644
> --- a/arch/x86/kernel/apic/hw_nmi.c
> +++ b/arch/x86/kernel/apic/hw_nmi.c
> @@ -24,7 +24,7 @@ u64 hw_nmi_get_sample_period(void)
> ?}
> ?#endif
>
> -#ifndef CONFIG_HARDLOCKUP_DETECTOR
> +#ifdef CONFIG_HARDLOCKUP_DETECTOR
> ?void touch_nmi_watchdog(void)
> ?{
> ? ? ? ?touch_softlockup_watchdog();
>
On Sun, Dec 12, 2010 at 12:26 PM, Rakib Mullick <[email protected]> wrote:
> On Sun, Dec 12, 2010 at 11:27 AM, Rakib Mullick <[email protected]> wrote:
>> On Fri, Dec 10, 2010 at 11:25 PM, Randy Dunlap <[email protected]> wrote:
>>> On Fri, 10 Dec 2010 13:57:46 +1100 Stephen Rothwell wrote:
>>>
>
> NO. I don't think this is the correct one. Cause we don't want
> touch_softlockup_watchdog() to be called if
> CONFIG_HARDLOCKUP_DETECTOR=y.
>
I think simply removing touch_softlockup_watchdog() definition from
hw_nmi.c is right. Am I right, Don?
thanks,
rakib
On Sun, Dec 12, 2010 at 11:27:02AM +0600, Rakib Mullick wrote:
> On Fri, Dec 10, 2010 at 11:25 PM, Randy Dunlap <[email protected]> wrote:
> > On Fri, 10 Dec 2010 13:57:46 +1100 Stephen Rothwell wrote:
> >
> >> Hi all,
> >>
> >> Changes since 20101209:
> >
> >
> > arch/x86/kernel/apic/hw_nmi.c:28: error: redefinition of 'touch_nmi_watchdog'
> > include/linux/nmi.h:22: note: previous definition of 'touch_nmi_watchdog' was here
I'll have to checkout that branch to see what got merged. I thought I
fixed all these. Is there a config I can use to duplicate these?
> diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
> index c558e11..2056569 100644
> --- a/arch/x86/kernel/apic/hw_nmi.c
> +++ b/arch/x86/kernel/apic/hw_nmi.c
> @@ -24,7 +24,7 @@ u64 hw_nmi_get_sample_period(void)
> }
> #endif
>
> -#ifndef CONFIG_HARDLOCKUP_DETECTOR
> +#ifdef CONFIG_HARDLOCKUP_DETECTOR
> void touch_nmi_watchdog(void)
> {
> touch_softlockup_watchdog();
NAK. This isn't the right patch. This chunk is in here because of
changes to nmi.h. Something broke in that file.
Cheers,
Don
On Sun, Dec 12, 2010 at 11:27:02AM +0600, Rakib Mullick wrote:
> On Fri, Dec 10, 2010 at 11:25 PM, Randy Dunlap <[email protected]> wrote:
> > On Fri, 10 Dec 2010 13:57:46 +1100 Stephen Rothwell wrote:
> >
> >> Hi all,
> >>
> >> Changes since 20101209:
> >
> >
> > arch/x86/kernel/apic/hw_nmi.c:28: error: redefinition of 'touch_nmi_watchdog'
> > include/linux/nmi.h:22: note: previous definition of 'touch_nmi_watchdog' was here
> >
> Hello Randy,
>
> Please checkout the following patch. Does it work?
This fixes the problem. Sorry about that. I need to remember to try more
random config options to catch these things.
----8<---
From: Don Zickus <[email protected]>
Date: Mon, 13 Dec 2010 10:31:58 -0500
Subject: [PATCH] x86, watchdog: Compile fix when CONFIG_LOCAL_APIC not enabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
When adjusting the code to handle removing the old nmi watchdog,
I forgot to consider the compile case when the local apic is not
enabled. This small change fixes the compile warning:
arch/x86/kernel/apic/hw_nmi.c:28:6: error: redefinition of ‘touch_nmi_watchdog’
Signed-off-by: Don Zickus <[email protected]>
---
arch/x86/kernel/apic/hw_nmi.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
index c558e11..93da91d 100644
--- a/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@ -17,6 +17,7 @@
#include <linux/nmi.h>
#include <linux/module.h>
+#ifdef ARCH_HAS_NMI_WATCHDOG
#ifdef CONFIG_HARDLOCKUP_DETECTOR
u64 hw_nmi_get_sample_period(void)
{
@@ -31,6 +32,8 @@ void touch_nmi_watchdog(void)
}
EXPORT_SYMBOL(touch_nmi_watchdog);
#endif
+#endif
+
#ifdef arch_trigger_all_cpu_backtrace
/* For reliability, we're prepared to waste bits here. */
static DECLARE_BITMAP(backtrace_mask, NR_CPUS) __read_mostly;
--
1.7.3.2
On 12/13/10 07:37, Don Zickus wrote:
> On Sun, Dec 12, 2010 at 11:27:02AM +0600, Rakib Mullick wrote:
>> On Fri, Dec 10, 2010 at 11:25 PM, Randy Dunlap <[email protected]> wrote:
>>> On Fri, 10 Dec 2010 13:57:46 +1100 Stephen Rothwell wrote:
>>>
>>>> Hi all,
>>>>
>>>> Changes since 20101209:
>>>
>>>
>>> arch/x86/kernel/apic/hw_nmi.c:28: error: redefinition of 'touch_nmi_watchdog'
>>> include/linux/nmi.h:22: note: previous definition of 'touch_nmi_watchdog' was here
>>>
>> Hello Randy,
>>
>> Please checkout the following patch. Does it work?
>
> This fixes the problem. Sorry about that. I need to remember to try more
> random config options to catch these things.
> ----8<---
>
> From: Don Zickus <[email protected]>
> Date: Mon, 13 Dec 2010 10:31:58 -0500
> Subject: [PATCH] x86, watchdog: Compile fix when CONFIG_LOCAL_APIC not enabled
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> When adjusting the code to handle removing the old nmi watchdog,
> I forgot to consider the compile case when the local apic is not
> enabled. This small change fixes the compile warning:
>
> arch/x86/kernel/apic/hw_nmi.c:28:6: error: redefinition of ‘touch_nmi_watchdog’
>
> Signed-off-by: Don Zickus <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Thanks.
> ---
> arch/x86/kernel/apic/hw_nmi.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
> index c558e11..93da91d 100644
> --- a/arch/x86/kernel/apic/hw_nmi.c
> +++ b/arch/x86/kernel/apic/hw_nmi.c
> @@ -17,6 +17,7 @@
> #include <linux/nmi.h>
> #include <linux/module.h>
>
> +#ifdef ARCH_HAS_NMI_WATCHDOG
> #ifdef CONFIG_HARDLOCKUP_DETECTOR
> u64 hw_nmi_get_sample_period(void)
> {
> @@ -31,6 +32,8 @@ void touch_nmi_watchdog(void)
> }
> EXPORT_SYMBOL(touch_nmi_watchdog);
> #endif
> +#endif
> +
> #ifdef arch_trigger_all_cpu_backtrace
> /* For reliability, we're prepared to waste bits here. */
> static DECLARE_BITMAP(backtrace_mask, NR_CPUS) __read_mostly;
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Ave,
2010/12/10 Stephen Rothwell <[email protected]>:
> Hi all,
>
> Changes since 20101209:
>
WARNING: modpost: Found 14 section mismatch(es).
To see full details build your kernel with:
'make CONFIG_DEBUG_SECTION_MISMATCH=y'
GEN .version
CHK include/generated/compile.h
UPD include/generated/compile.h
CC init/version.o
LD init/built-in.o
LD .tmp_vmlinux1
arch/x86/built-in.o: In function `kvm_smp_prepare_boot_cpu':
kvm.c:(.init.text+0xf446): undefined reference to `kvm_register_clock'
drivers/built-in.o: In function `generate_netlink_event':
(.text+0x1087ee): undefined reference to `__alloc_skb'
drivers/built-in.o: In function `generate_netlink_event':
(.text+0x108897): undefined reference to `skb_put'
drivers/built-in.o: In function `generate_netlink_event':
(.text+0x108930): undefined reference to `kfree_skb'
drivers/built-in.o: In function `generate_netlink_event':
(.text+0x108947): undefined reference to `nla_reserve'
drivers/built-in.o: In function `generate_netlink_event':
(.text+0x108990): undefined reference to `kfree_skb'
drivers/built-in.o: In function `generate_netlink_event':
(.text+0x1089e9): undefined reference to `kfree_skb'
drivers/built-in.o: In function `generate_netlink_event':
(.text+0x1089f8): undefined reference to `init_net'
drivers/built-in.o: In function `generate_netlink_event':
(.text+0x108a0b): undefined reference to `netlink_broadcast'
drivers/built-in.o: In function `thermal_init':
thermal_sys.c:(.init.text+0xbd00): undefined reference to `genl_register_family'
thermal_sys.c:(.init.text+0xbd2f): undefined reference to
`genl_register_mc_group'
thermal_sys.c:(.init.text+0xbd57): undefined reference to
`genl_unregister_family'
drivers/built-in.o: In function `thermal_exit':
thermal_sys.c:(.exit.text+0x154c): undefined reference to
`genl_unregister_family'
make[1]: *** [.tmp_vmlinux1] Error 1
make: *** [sub-make] Error 2
--
Slawa!
Zimny "Spie dziadu!" Lech z Wawelu
Hej, tam!
Wydar?em klejnot szans
http://www.youtube.com/watch?v=VXWTlYzVFUA
Sorry, this should be reported for next-20101213
W dniu 13 grudnia 2010 20:02 u?ytkownik Zimny Lech
<[email protected]> napisa?:
> Ave,
>
> 2010/12/10 Stephen Rothwell <[email protected]>:
>> Hi all,
>>
>> Changes since 20101209:
>>
>
> WARNING: modpost: Found 14 section mismatch(es).
> To see full details build your kernel with:
> 'make CONFIG_DEBUG_SECTION_MISMATCH=y'
> ?GEN ? ? .version
> ?CHK ? ? include/generated/compile.h
> ?UPD ? ? include/generated/compile.h
> ?CC ? ? ?init/version.o
> ?LD ? ? ?init/built-in.o
> ?LD ? ? ?.tmp_vmlinux1
> arch/x86/built-in.o: In function `kvm_smp_prepare_boot_cpu':
> kvm.c:(.init.text+0xf446): undefined reference to `kvm_register_clock'
> drivers/built-in.o: In function `generate_netlink_event':
> (.text+0x1087ee): undefined reference to `__alloc_skb'
> drivers/built-in.o: In function `generate_netlink_event':
> (.text+0x108897): undefined reference to `skb_put'
> drivers/built-in.o: In function `generate_netlink_event':
> (.text+0x108930): undefined reference to `kfree_skb'
> drivers/built-in.o: In function `generate_netlink_event':
> (.text+0x108947): undefined reference to `nla_reserve'
> drivers/built-in.o: In function `generate_netlink_event':
> (.text+0x108990): undefined reference to `kfree_skb'
> drivers/built-in.o: In function `generate_netlink_event':
> (.text+0x1089e9): undefined reference to `kfree_skb'
> drivers/built-in.o: In function `generate_netlink_event':
> (.text+0x1089f8): undefined reference to `init_net'
> drivers/built-in.o: In function `generate_netlink_event':
> (.text+0x108a0b): undefined reference to `netlink_broadcast'
> drivers/built-in.o: In function `thermal_init':
> thermal_sys.c:(.init.text+0xbd00): undefined reference to `genl_register_family'
> thermal_sys.c:(.init.text+0xbd2f): undefined reference to
> `genl_register_mc_group'
> thermal_sys.c:(.init.text+0xbd57): undefined reference to
> `genl_unregister_family'
> drivers/built-in.o: In function `thermal_exit':
> thermal_sys.c:(.exit.text+0x154c): undefined reference to
> `genl_unregister_family'
> make[1]: *** [.tmp_vmlinux1] Error 1
> make: *** [sub-make] Error 2
>
>
> --
> Slawa!
> Zimny "Spie dziadu!" Lech z Wawelu
>
> Hej, tam!
> Wydar?em klejnot szans
> http://www.youtube.com/watch?v=VXWTlYzVFUA
>
--
Slawa!
Zimny "Spie dziadu!" Lech z Wawelu
Hej, tam!
Wydar?em klejnot szans
http://www.youtube.com/watch?v=VXWTlYzVFUA
Hi Don,
On Mon, 13 Dec 2010 09:44:34 -0500 Don Zickus <[email protected]> wrote:
>
> On Sun, Dec 12, 2010 at 11:27:02AM +0600, Rakib Mullick wrote:
> > On Fri, Dec 10, 2010 at 11:25 PM, Randy Dunlap <[email protected]> wrote:
> > > On Fri, 10 Dec 2010 13:57:46 +1100 Stephen Rothwell wrote:
> > >
> > >> Hi all,
> > >>
> > >> Changes since 20101209:
> > >
> > >
> > > arch/x86/kernel/apic/hw_nmi.c:28: error: redefinition of 'touch_nmi_watchdog'
> > > include/linux/nmi.h:22: note: previous definition of 'touch_nmi_watchdog' was here
>
> I'll have to checkout that branch to see what got merged. I thought I
> fixed all these. Is there a config I can use to duplicate these?
Randy's original post had the config attached.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Mon, Dec 13, 2010 at 8:44 PM, Don Zickus <[email protected]> wrote:
> On Sun, Dec 12, 2010 at 11:27:02AM +0600, Rakib Mullick wrote:
>> On Fri, Dec 10, 2010 at 11:25 PM, Randy Dunlap <[email protected]> wrote:
>> > On Fri, 10 Dec 2010 13:57:46 +1100 Stephen Rothwell wrote:
>> >
>> >> Hi all,
>> >>
>> >> Changes since 20101209:
>> >
>> >
>> > arch/x86/kernel/apic/hw_nmi.c:28: error: redefinition of 'touch_nmi_watchdog'
>> > include/linux/nmi.h:22: note: previous definition of 'touch_nmi_watchdog' was here
>
> I'll have to checkout that branch to see what got merged. ?I thought I
> fixed all these. ?Is there a config I can use to duplicate these?
>
Allnoconfig also introduces this breakage.
thanks,
rakib
>
> Cheers,
> Don
>
>
On Tue, Dec 14, 2010 at 10:08:49AM +1100, Stephen Rothwell wrote:
> Hi Don,
>
> On Mon, 13 Dec 2010 09:44:34 -0500 Don Zickus <[email protected]> wrote:
> >
> > On Sun, Dec 12, 2010 at 11:27:02AM +0600, Rakib Mullick wrote:
> > > On Fri, Dec 10, 2010 at 11:25 PM, Randy Dunlap <[email protected]> wrote:
> > > > On Fri, 10 Dec 2010 13:57:46 +1100 Stephen Rothwell wrote:
> > > >
> > > >> Hi all,
> > > >>
> > > >> Changes since 20101209:
> > > >
> > > >
> > > > arch/x86/kernel/apic/hw_nmi.c:28: error: redefinition of 'touch_nmi_watchdog'
> > > > include/linux/nmi.h:22: note: previous definition of 'touch_nmi_watchdog' was here
> >
> > I'll have to checkout that branch to see what got merged. I thought I
> > fixed all these. Is there a config I can use to duplicate these?
>
> Randy's original post had the config attached.
Thanks. My patch in a different post on this thread should resolve the
issue.
Cheers,
Don