linux-next: Tree for August 6 - Kernel

This is a discussion on linux-next: Tree for August 6 - Kernel ; Hi all, Changes since next-20080805: Changed tree: v4l-dvb (try a new tree to see). The md-current and md trees were not fetched due to a fault on the server. The v4l-dvb tree is back and merged fine. The ide tree ...

+ Reply to Thread
Results 1 to 10 of 10

Thread: linux-next: Tree for August 6

  1. linux-next: Tree for August 6

    Hi all,

    Changes since next-20080805:

    Changed tree: v4l-dvb (try a new tree to see).

    The md-current and md trees were not fetched due to a fault on the server.

    The v4l-dvb tree is back and merged fine.

    The ide tree gained a trivial conflict against Linus' tree.

    The crypto tree lost its build fix patch.

    The mfd tree lost its build problem.

    I again merged Linus' tree a second time at the end of the tree today -
    this made the patches much smaller as -rc2 had been released.

    I have also applied the following patches for known problems:

    Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target
    Revert "Input: expand keycode space"
    xen-balloon: fix up sysfs issues

    ----------------------------------------------------------------------------

    I have created today's linux-next tree at
    git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
    (patches at
    http://www.kernel.org/pub/linux/kern...fr/linux-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, it is also built with powerpc allnoconfig,
    44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.

    Below is a summary of the state of the merge.

    We are up to 107 trees (counting Linus' and 14 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 Jan Dittmer for adding the linux-next tree to his build tests
    at http://l4x.org/k/ , the guys at http://test.kernel.org/ and 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 sfr@canb.auug.org.au

    $ git checkout master
    $ git reset --hard stable
    Merging origin/master
    Merging powerpc-merge/merge
    Merging scsi-rc-fixes/master
    Merging net-current/master
    Merging sparc-current/master
    Merging sound-current/for-linus
    Merging arm-current/master
    Merging pci-current/for-linus
    Merging wireless-current/master
    Merging kbuild-current/master
    Merging quilt/driver-core.current
    Merging quilt/usb.current
    Applying usb: two more functions are needed when CONFIG_PM is not set
    Merging cpufreq-current/fixes
    Merging input-current/for-linus
    Merging md-current/for-2.6.26
    Merging dwmw2/master
    Merging quilt/driver-core
    Applying driver-core: kobject verification fixup
    Merging quilt/usb
    Merging tip-core/auto-core-next
    CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h
    Merging cpus4096/auto-cpus4096-next
    CONFLICT (content): Merge conflict in net/sunrpc/svc.c
    Merging ftrace/auto-ftrace-next
    Merging genirq/auto-genirq-next
    Merging safe-poison-pointers/auto-safe-poison-pointers-next
    Merging sched/auto-sched-next
    Merging stackprotector/auto-stackprotector-next
    Merging timers/auto-timers-next
    Merging x86/auto-x86-next
    CONFLICT (content): Merge conflict in arch/x86/kernel/genapic_64.c
    CONFLICT (content): Merge conflict in drivers/pci/dmar.c
    Merging pci/linux-next
    Merging quilt/device-mapper
    Merging hid/mm
    Merging quilt/i2c
    Merging quilt/kernel-doc
    Merging avr32/avr32-arch
    Merging v4l-dvb/master
    Merging s390/features
    Merging sh/master
    Merging jfs/next
    Merging kbuild/master
    Merging quilt/ide
    CONFLICT (content): Merge conflict in drivers/ide/ide-dma.c
    CONFLICT (content): Merge conflict in drivers/ide/ide-iops.c
    Merging libata/NEXT
    Merging nfs/linux-next
    Merging xfs/master
    Merging infiniband/for-next
    Merging acpi/test
    Merging blackfin/for-linus
    Merging nfsd/nfsd-next
    Merging ieee1394/for-next
    Merging hwmon/testing
    Merging ubi/linux-next
    Merging kvm/master
    CONFLICT (content): Merge conflict in include/linux/kvm.h
    Merging dlm/next
    Merging scsi/master
    Merging ia64/test
    Merging tests/master
    Merging ocfs2/linux-next
    Merging quilt/m68k
    Merging powerpc/powerpc-next
    Merging ext4/next
    Merging 4xx/next
    Merging async_tx/next
    Merging udf/for_next
    Merging net/master
    Merging sparc/master
    Merging galak/powerpc-next
    Merging mtd/master
    Merging wireless/master
    Merging crypto/master
    Merging vfs/for-next
    Merging sound/for-next
    Merging arm/devel
    Merging cpufreq/next
    Merging v9fs/for-next
    Merging quilt/rr
    Merging cifs/master
    Merging mmc/next
    Merging gfs2/master
    Merging input/next
    Merging semaphore/semaphore
    Merging semaphore-removal/semaphore-removal
    Merging bkl-removal/bkl-removal
    Merging trivial/next
    CONFLICT (content): Merge conflict in Documentation/edac.txt
    CONFLICT (content): Merge conflict in include/linux/securebits.h
    Merging ubifs/linux-next
    Merging lsm/for-next
    Merging block/for-next
    Merging embedded/master
    Merging firmware/master
    CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Kconfig
    CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile
    Merging pcmcia/master
    Merging battery/master
    Merging leds/for-mm
    Merging backlight/for-mm
    Merging kgdb/kgdb-next
    Merging slab/for-next
    Merging m68knommu/for-next
    Merging uclinux/for-next
    Merging md/for-next
    Merging cris/for-next
    Merging kmemcheck/auto-kmemcheck-next
    Merging generic-ipi/auto-generic-ipi-next
    Merging mips/mips-for-linux-next
    Merging mfd/for-next
    Merging hdlc/hdlc-next
    Merging drm/drm-next
    Merging voltage/reg-for-linus
    Merging security-testing/next
    Merging lblnet/master
    Merging quilt/ttydev
    Merging agp/agp-next
    Merging master_tmp
    Applying Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target
    Created commit f757622: Revert "Input: expand keycode space"
    Applying xen-balloon: fix up sysfs issues

    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.4.9 (GNU/Linux)

    iEYEARECAAYFAkiZYKwACgkQjjKRsyhoI8xapwCdHUSLbb/fa5sANSzMpmDJjYcu
    2v8AnRqaSSlE581sQhTXlYDs5nvldanP
    =ZA2y
    -----END PGP SIGNATURE-----


  2. Re: linux-next: Tree for August 6 (8390 et al)

    One randconfig ends with:

    drivers/built-in.o: In function `wd_probe1':
    wd.c.init.text+0x6179): undefined reference to `NS8390p_init'
    make[1]: *** [.tmp_vmlinux1] Error 1


    and another one ends with:

    ERROR: "ei_close" [drivers/net/hp-plus.ko] undefined!
    ERROR: "ei_open" [drivers/net/hp-plus.ko] undefined!
    ERROR: "ei_interrupt" [drivers/net/hp-plus.ko] undefined!
    ERROR: "__alloc_ei_netdev" [drivers/net/hp-plus.ko] undefined!
    make[2]: *** [__modpost] Error 1



    ---
    ~Randy
    Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
    http://linuxplumbersconf.org/
    --
    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/

  3. [PATCH -next] Panasonic ACPI depends on INPUT

    From: Randy Dunlap

    Panasonic ACPI driver needs to depend on INPUT.
    Otherwise it has build errors when CONFIG_INPUT=n:

    drivers/built-in.o: In function `acpi_pcc_hotkey_remove':
    pcc_acpi.c.text+0x25ded): undefined reference to `input_unregister_device'
    pcc_acpi.c.text+0x25e03): undefined reference to `input_free_device'
    drivers/built-in.o: In function `acpi_pcc_hotkey_notify':
    pcc_acpi.c.text+0x260d5): undefined reference to `input_event'
    pcc_acpi.c.text+0x260e2): undefined reference to `input_event'
    drivers/built-in.o: In function `acpi_pcc_hotkey_add':
    pcc_acpi.c.text+0x26267): undefined reference to `input_allocate_device'
    pcc_acpi.c.text+0x26348): undefined reference to `input_register_device'
    pcc_acpi.c.text+0x26405): undefined reference to `input_unregister_device'
    pcc_acpi.c.text+0x26423): undefined reference to `input_free_device'
    make[1]: *** [.tmp_vmlinux1] Error 1

    Signed-off-by: Randy Dunlap
    ---
    drivers/acpi/Kconfig | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- linux-next-20080806.orig/drivers/acpi/Kconfig
    +++ linux-next-20080806/drivers/acpi/Kconfig
    @@ -259,7 +259,7 @@ config ACPI_ASUS

    config ACPI_PANASONIC
    tristate "Panasonic Laptop Extras"
    - depends on X86
    + depends on X86 && INPUT
    select BACKLIGHT_CLASS_DEVICE
    ---help---
    This driver adds support for access to certain system settings
    --
    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/

  4. Re: linux-next: Tree for August 6 (8390 et al)

    On Wed, 6 Aug 2008, Randy Dunlap wrote:
    > One randconfig ends with:
    >
    > drivers/built-in.o: In function `wd_probe1':
    > wd.c.init.text+0x6179): undefined reference to `NS8390p_init'
    > make[1]: *** [.tmp_vmlinux1] Error 1


    drivers/net/Makefile has:

    obj-$(CONFIG_WD80x3) += wd.o 8390.o

    So either wd_probe1() should call NS8390_init(), or obj-$(CONFIG_WD80x3)
    should link with 8390p.o. Don't know which is the appropriate change
    here (my gut feeling says the latter).

    Gr{oetje,eeting}s,

    Geert

    --
    Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

    In personal conversations with technical people, I call myself a hacker. But
    when I'm talking to journalists I just say "programmer" or something like that.
    -- Linus Torvalds
    --
    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/

  5. Re: linux-next: Tree for August 6 (8390 et al)

    On Thu, 7 Aug 2008 09:20:07 +0200 (CEST)
    Geert Uytterhoeven wrote:

    > On Wed, 6 Aug 2008, Randy Dunlap wrote:
    > > One randconfig ends with:
    > >
    > > drivers/built-in.o: In function `wd_probe1':
    > > wd.c.init.text+0x6179): undefined reference to `NS8390p_init'
    > > make[1]: *** [.tmp_vmlinux1] Error 1

    >
    > drivers/net/Makefile has:
    >
    > obj-$(CONFIG_WD80x3) += wd.o 8390.o
    >
    > So either wd_probe1() should call NS8390_init(), or obj-$(CONFIG_WD80x3)
    > should link with 8390p.o. Don't know which is the appropriate change
    > here (my gut feeling says the latter).


    Safest is the latter. The shared memory interface on the wd is full speed
    8 or 16bit (depending on card/jumpers) but I'm not clear about the NIC.
    Most of the performance hit is on the packet transfer which is private
    methods on this device so using 8390p won't make a big difference on this
    board anyway.
    --
    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/

  6. [PATCH] net, wd.c: fix undefined reference to `NS8390p_init'


    * Alan Cox wrote:

    > On Thu, 7 Aug 2008 09:20:07 +0200 (CEST)
    > Geert Uytterhoeven wrote:
    >
    > > On Wed, 6 Aug 2008, Randy Dunlap wrote:
    > > > One randconfig ends with:
    > > >
    > > > drivers/built-in.o: In function `wd_probe1':
    > > > wd.c.init.text+0x6179): undefined reference to `NS8390p_init'
    > > > make[1]: *** [.tmp_vmlinux1] Error 1

    > >
    > > drivers/net/Makefile has:
    > >
    > > obj-$(CONFIG_WD80x3) += wd.o 8390.o
    > >
    > > So either wd_probe1() should call NS8390_init(), or obj-$(CONFIG_WD80x3)
    > > should link with 8390p.o. Don't know which is the appropriate change
    > > here (my gut feeling says the latter).

    >
    > Safest is the latter. The shared memory interface on the wd is full
    > speed 8 or 16bit (depending on card/jumpers) but I'm not clear about
    > the NIC. Most of the performance hit is on the packet transfer which
    > is private methods on this device so using 8390p won't make a big
    > difference on this board anyway.


    Alan, Jeff, i triggered this too with latest -git, please pick up the
    fix below if you dont have it already.

    Ingo

    ------------------>
    From c03cb1727bb4c5433436bfb0fab59fdcc00749c3 Mon Sep 17 00:00:00 2001
    From: Ingo Molnar
    Date: Mon, 11 Aug 2008 11:11:42 +0200
    Subject: [PATCH] net, wd.c: fix undefined reference to `NS8390p_init'

    fix:

    drivers/built-in.o: In function `wd_probe1':
    wd.c.init.text+0xb247): undefined reference to `NS8390p_init'

    that triggers with:

    http://redhat.com/~mingo/misc/config..._CEST_2008.bad

    Signed-off-by: Ingo Molnar
    ---
    drivers/net/Makefile | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/drivers/net/Makefile b/drivers/net/Makefile
    index 7629c90..dc6dbf6 100644
    --- a/drivers/net/Makefile
    +++ b/drivers/net/Makefile
    @@ -106,7 +106,7 @@ ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
    obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
    endif
    obj-$(CONFIG_68360_ENET) += 68360enet.o
    -obj-$(CONFIG_WD80x3) += wd.o 8390.o
    +obj-$(CONFIG_WD80x3) += wd.o 8390p.o
    obj-$(CONFIG_EL2) += 3c503.o 8390p.o
    obj-$(CONFIG_NE2000) += ne.o 8390p.o
    obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o
    --
    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/

  7. Re: [PATCH] net, wd.c: fix undefined reference to `NS8390p_init'

    Ingo Molnar wrote:
    > * Alan Cox wrote:
    >
    >> On Thu, 7 Aug 2008 09:20:07 +0200 (CEST)
    >> Geert Uytterhoeven wrote:
    >>
    >>> On Wed, 6 Aug 2008, Randy Dunlap wrote:
    >>>> One randconfig ends with:
    >>>>
    >>>> drivers/built-in.o: In function `wd_probe1':
    >>>> wd.c.init.text+0x6179): undefined reference to `NS8390p_init'
    >>>> make[1]: *** [.tmp_vmlinux1] Error 1
    >>> drivers/net/Makefile has:
    >>>
    >>> obj-$(CONFIG_WD80x3) += wd.o 8390.o
    >>>
    >>> So either wd_probe1() should call NS8390_init(), or obj-$(CONFIG_WD80x3)
    >>> should link with 8390p.o. Don't know which is the appropriate change
    >>> here (my gut feeling says the latter).

    >> Safest is the latter. The shared memory interface on the wd is full
    >> speed 8 or 16bit (depending on card/jumpers) but I'm not clear about
    >> the NIC. Most of the performance hit is on the packet transfer which
    >> is private methods on this device so using 8390p won't make a big
    >> difference on this board anyway.

    >
    > Alan, Jeff, i triggered this too with latest -git, please pick up the
    > fix below if you dont have it already.
    >
    > Ingo
    >
    > ------------------>
    >>From c03cb1727bb4c5433436bfb0fab59fdcc00749c3 Mon Sep 17 00:00:00 2001

    > From: Ingo Molnar
    > Date: Mon, 11 Aug 2008 11:11:42 +0200
    > Subject: [PATCH] net, wd.c: fix undefined reference to `NS8390p_init'
    >
    > fix:
    >
    > drivers/built-in.o: In function `wd_probe1':
    > wd.c.init.text+0xb247): undefined reference to `NS8390p_init'
    >
    > that triggers with:
    >
    > http://redhat.com/~mingo/misc/config..._CEST_2008.bad
    >
    > Signed-off-by: Ingo Molnar
    > ---
    > drivers/net/Makefile | 2 +-
    > 1 files changed, 1 insertions(+), 1 deletions(-)


    DaveM should have it AFAIK, I'll double-check and make sure it got in
    somewhere.

    Jeff



    --
    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/

  8. Re: [PATCH] net, wd.c: fix undefined reference to `NS8390p_init'


    * Jeff Garzik wrote:

    > Ingo Molnar wrote:
    >> * Alan Cox wrote:
    >>
    >>> On Thu, 7 Aug 2008 09:20:07 +0200 (CEST)
    >>> Geert Uytterhoeven wrote:
    >>>
    >>>> On Wed, 6 Aug 2008, Randy Dunlap wrote:
    >>>>> One randconfig ends with:
    >>>>>
    >>>>> drivers/built-in.o: In function `wd_probe1':
    >>>>> wd.c.init.text+0x6179): undefined reference to `NS8390p_init'
    >>>>> make[1]: *** [.tmp_vmlinux1] Error 1
    >>>> drivers/net/Makefile has:
    >>>>
    >>>> obj-$(CONFIG_WD80x3) += wd.o 8390.o
    >>>>
    >>>> So either wd_probe1() should call NS8390_init(), or obj-$(CONFIG_WD80x3)
    >>>> should link with 8390p.o. Don't know which is the appropriate change
    >>>> here (my gut feeling says the latter).
    >>> Safest is the latter. The shared memory interface on the wd is full
    >>> speed 8 or 16bit (depending on card/jumpers) but I'm not clear about
    >>> the NIC. Most of the performance hit is on the packet transfer which
    >>> is private methods on this device so using 8390p won't make a big
    >>> difference on this board anyway.

    >>
    >> Alan, Jeff, i triggered this too with latest -git, please pick up the
    >> fix below if you dont have it already.
    >>
    >> Ingo
    >>
    >> ------------------>
    >>> From c03cb1727bb4c5433436bfb0fab59fdcc00749c3 Mon Sep 17 00:00:00 2001

    >> From: Ingo Molnar
    >> Date: Mon, 11 Aug 2008 11:11:42 +0200
    >> Subject: [PATCH] net, wd.c: fix undefined reference to `NS8390p_init'
    >>
    >> fix:
    >>
    >> drivers/built-in.o: In function `wd_probe1':
    >> wd.c.init.text+0xb247): undefined reference to `NS8390p_init'
    >>
    >> that triggers with:
    >>
    >> http://redhat.com/~mingo/misc/config..._CEST_2008.bad
    >>
    >> Signed-off-by: Ingo Molnar
    >> ---
    >> drivers/net/Makefile | 2 +-
    >> 1 files changed, 1 insertions(+), 1 deletions(-)

    >
    > DaveM should have it AFAIK, I'll double-check and make sure it got in
    > somewhere.


    there's also this build failure:

    wd.c.text+0x38804): undefined reference to `ei_close'
    wd.c.text+0x38882): undefined reference to `ei_open'
    wd.c.init.text+0x4952): undefined reference to `ei_interrupt'
    wd.c.init.text+0x4c27): undefined reference to `ei_poll'
    (.init.text+0x4c83): undefined reference to `__alloc_ei_netdev'

    which are only defined in 8390.c.

    Ingo
    --
    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/

  9. Re: [PATCH -next] Panasonic ACPI depends on INPUT

    Randy Dunlap wrote:
    > From: Randy Dunlap
    >
    > Panasonic ACPI driver needs to depend on INPUT.
    > Otherwise it has build errors when CONFIG_INPUT=n:


    Applied thanks.

    -Andi

    --
    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/

  10. Re: [PATCH] net, wd.c: fix undefined reference to `NS8390p_init'

    From: Jeff Garzik
    Date: Mon, 11 Aug 2008 05:47:33 -0400

    > DaveM should have it AFAIK, I'll double-check and make sure it got in
    > somewhere.


    I pushed your most recent merge of driver fixes to Linus so if it's
    not in his tree I haven't seen it yet. :-)

    --
    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/

+ Reply to Thread