linux-next: Tree for October 22 - Kernel

This is a discussion on linux-next: Tree for October 22 - Kernel ; Hi all, Today's tree will not build for powerpc allyesconfig (libc aborts the link due to a free() problem), sparc(32) defconfig and probably some other configurations. I am no longer commenting on conflicts that are clearly just caused by slight ...

+ Reply to Thread
Results 1 to 2 of 2

Thread: linux-next: Tree for October 22

  1. linux-next: Tree for October 22

    Hi all,

    Today's tree will not build for powerpc allyesconfig (libc aborts the
    link due to a free() problem), sparc(32) defconfig and probably some
    other configurations.

    I am no longer commenting on conflicts that are clearly just caused by
    slight differences in what has been merged into Linus' tree and
    linux-next or conflicts caused by further changes in the linux-next after
    a subset of a tree has been merged.

    Changes since 20081021:

    New tree:
    dwmw2-iommu

    Dropped trees:
    tests (because its future is in doubt and it has conflicts)
    v4l-dvb (the tree is a mess)
    proc (messy conflicts, hopefully fixed tomorrow)

    Trees undropped:
    bdev

    The cpus4096 tree lost its conflict.

    The stackprotector tree lost its conflict, but gained a build fix patch.

    The timers tree lost its 2 conflicts and its build fix patch.

    The pci tree gained a build fix patch.

    The kmemcheck tree lost 4 conflicts.

    The ttydev tree lost its conflict.

    The fastboot tree lost its 3 conflicts.

    I have also applied the following patches for known problems:

    sparc: qlogicpti fallout from sbus removal
    Fix page_cgroup build breakage
    mfd/wm8350: don't export static functions

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

    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 121 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
    Merging cpufreq-current/fixes
    Merging input-current/for-linus
    Merging md-current/for-2.6.26
    Merging dwmw2/master
    Merging arm/devel
    Merging avr32/avr32-arch
    Merging blackfin/for-linus
    Merging cris/for-next
    Merging ia64/test
    Merging quilt/m68k
    Merging m68knommu/for-next
    Merging mips/mips-for-linux-next
    Merging parisc/master
    Merging powerpc/next
    Merging 4xx/next
    Merging galak/powerpc-next
    Merging pxa/for-next
    Merging s390/features
    Merging sh/master
    Merging sparc/master
    Merging x86/auto-x86-next
    Merging xtensa/master
    Merging quilt/driver-core
    Merging quilt/usb
    Created commit cb276b5: Revert "USB: remove info() macro from usb.h"
    Created commit f56529d: Revert "USB: remove warn() macro from usb.h"
    Merging tip-core/auto-core-next
    Merging cpus4096/auto-cpus4096-next
    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
    Applying stackprotector: fix up bad merge
    Merging timers/auto-timers-next
    Merging pci/linux-next
    Applying pci: move include of io.h so it doesn't need to be exported
    Merging quilt/device-mapper
    Merging hid/mm
    Merging quilt/i2c
    Merging quilt/jdelvare-hwmon
    Merging quilt/kernel-doc
    Merging jfs/next
    Merging kbuild/master
    Merging quilt/ide
    Merging libata/NEXT
    Merging nfs/linux-next
    Merging xfs/master
    Merging infiniband/for-next
    Merging acpi/test
    CONFLICT (content): Merge conflict in MAINTAINERS
    CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/boot.c
    CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/sleep.c
    CONFLICT (content): Merge conflict in drivers/acpi/Kconfig
    CONFLICT (content): Merge conflict in drivers/pnp/Makefile
    CONFLICT (content): Merge conflict in drivers/pnp/quirks.c
    Applying acpi: merge fix for dpulicate acpi_mcfg_64bit_base_addr
    Applying acpi: acpi_os_hotplug_execute needs to be exported
    Merging nfsd/nfsd-next
    Merging ieee1394/for-next
    Merging ubi/linux-next
    Merging kvm/master
    Merging dlm/next
    Merging scsi/master
    Merging ocfs2/linux-next
    Merging ext4/next
    Merging async_tx/next
    Merging udf/for_next
    Merging net/master
    Merging mtd/master
    Merging wireless/master
    Merging crypto/master
    Merging vfs/for-next
    CONFLICT (content): Merge conflict in fs/ext4/namei.c
    Applying vfs/xfs: fallout from i_vnode change
    Applying vfs: fix up merge of ext4
    Merging sound/for-next
    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
    CONFLICT (content): Merge conflict in net/9p/trans_virtio.c
    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/scsi/qlogicpti.c
    CONFLICT (content): Merge conflict in firmware/WHENCE
    Merging pcmcia/master
    Merging battery/master
    Merging leds/for-mm
    Applying leds/acpi: fix merge fallout from acpi_driver_data change
    Merging backlight/for-mm
    Merging kgdb/kgdb-next
    Merging slab/for-next
    CONFLICT (content): Merge conflict in mm/Makefile
    Merging uclinux/for-next
    Merging md/for-next
    Merging kmemcheck/auto-kmemcheck-next
    CONFLICT (content): Merge conflict in MAINTAINERS
    CONFLICT (content): Merge conflict in mm/slab.c
    CONFLICT (content): Merge conflict in mm/slub.c
    Merging generic-ipi/auto-generic-ipi-next
    Merging mfd/for-next
    Merging hdlc/hdlc-next
    Merging drm/drm-next
    Merging voltage/for-linus
    Merging security-testing/next
    Merging lblnet/master
    Merging quilt/ttydev
    Merging agp/agp-next
    Merging creds/next-creds-subsys
    CONFLICT (content): Merge conflict in fs/devpts/inode.c
    CONFLICT (content): Merge conflict in fs/namespace.c
    CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c
    CONFLICT (content): Merge conflict in include/linux/sched.h
    CONFLICT (content): Merge conflict in kernel/exit.c
    CONFLICT (content): Merge conflict in kernel/fork.c
    CONFLICT (content): Merge conflict in kernel/signal.c
    CONFLICT (content): Merge conflict in mm/migrate.c
    CONFLICT (content): Merge conflict in net/9p/client.c
    CONFLICT (content): Merge conflict in security/selinux/hooks.c
    Merging oprofile/auto-oprofile-next
    CONFLICT (content): Merge conflict in drivers/oprofile/cpu_buffer.c
    CONFLICT (content): Merge conflict in drivers/oprofile/event_buffer.h
    Merging fastboot/auto-fastboot-next
    Merging sparseirq/auto-sparseirq-next
    Merging iommu/auto-iommu-next
    Merging uwb/for-upstream
    Merging watchdog/master
    Merging bdev/master
    Merging dwmw2-iommu/master
    Merging scsi-post-merge/master
    Applying sparc: qlogicpti fallout from sbus removal
    Applying Fix page_cgroup build breakage
    Applying mfd/wm8350: don't export static functions

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

    iEYEARECAAYFAkj+9J4ACgkQjjKRsyhoI8xfvACgjGtADmJL5P h0F5cwEi3vVbki
    LsIAn3jyICwgZHw4w2ZaiAFCUSOZXnQm
    =ylDf
    -----END PGP SIGNATURE-----


  2. Re: linux-next: Tree for October 22

    i386 allnoconfig:

    pci-dma.c.init.text+0x3381): undefined reference to `forbid_dac'
    pci-dma.c.init.text+0x3387): undefined reference to `forbid_dac'
    pci-dma.c.init.text+0x33a1): undefined reference to `forbid_dac'
    pci-dma.c.init.text+0x33a7): undefined reference to `forbid_dac'
    pci-dma.c.init.text+0x33e7): undefined reference to `forbid_dac'
    --
    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