linux-next: Tree for October 31 - Kernel

This is a discussion on linux-next: Tree for October 31 - Kernel ; Hi all, 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 ...

+ Reply to Thread
Results 1 to 5 of 5

Thread: linux-next: Tree for October 31

  1. linux-next: Tree for October 31

    Hi all,

    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 20081030:

    I remerged Linus' tree at the end of the build today since it added some
    useful fixes since I fetched it this morning.

    The sound tree gained a build fix patch.

    The hdlc tree gained a conflict against Linus' tree.

    The creds tree gained a conflict against the ext4 tree, 2 against Linus'
    tree and another against the security-testing tree.

    I have also applied the following patches for known problems:

    sparc: qlogicpti fallout from sbus removal
    Work around ld bug in older binutils (powerpc patch)
    ftrace: rename FTRACE to FUNCTION_TRACER more successfully. (sh patch)
    nfsctl: credentials error
    coda: credentials error
    cpu_alloc: per_cpu_offset is already defined for !CONFIG_SMP
    ia64: Fix gru compiler warning

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

    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 123 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/next
    Merging pxa/for-next
    Merging s390/features
    CONFLICT (content): Merge conflict in drivers/s390/net/qeth_l2_main.c
    CONFLICT (content): Merge conflict in drivers/s390/net/qeth_l3_main.c
    Merging sh/master
    Merging sparc/master
    Merging x86/auto-x86-next
    Merging xtensa/master
    Merging quilt/driver-core
    Merging quilt/usb
    Created commit 4218d56: Revert "USB: remove info() macro from usb.h"
    Created commit c258c25: 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
    Merging timers/auto-timers-next
    Merging pci/linux-next
    Merging quilt/device-mapper
    Merging hid/mm
    Merging quilt/i2c
    Merging quilt/jdelvare-hwmon
    Merging quilt/kernel-doc
    Merging v4l-dvb/master
    Applying v4l-dvb: fallout from DVB_DYNAMIC_MINORS addition
    Merging jfs/next
    Merging kbuild/master
    Merging quilt/ide
    Merging libata/NEXT
    Merging nfs/linux-next
    Merging xfs/master
    Applying fs: xfs needs inode_wait to be exported
    Merging infiniband/for-next
    Merging acpi/test
    Merging nfsd/nfsd-next
    Merging ieee1394/for-next
    Merging ubi/linux-next
    Merging kvm/master
    Merging dlm/next
    Merging scsi/master
    Merging tests/master
    CONFLICT (content): Merge conflict in lib/Kconfig.debug
    Merging ocfs2/linux-next
    Merging ext4/next
    Merging async_tx/next
    Merging udf/for_next
    Merging net/master
    CONFLICT (content): Merge conflict in drivers/net/wireless/p54/p54common.c
    Merging mtd/master
    Merging wireless/master
    Merging crypto/master
    Merging vfs/for-next
    Merging sound/for-next
    Applying ALSA: restore removeed variable declaration
    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
    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 arch/x86/mm/Makefile
    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
    CONFLICT (delete/modify): Documentation/DocBook/wanbook.tmpl deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of Documentation/DocBook/wanbook.tmpl left in tree.
    CONFLICT (delete/modify): drivers/net/wan/syncppp.c deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of drivers/net/wan/syncppp.c left in tree.
    $ git rm -f drivers/net/wan/syncppp.c
    $ git rm -f Documentation/DocBook/wanbook.tmpl
    Merging drm/drm-next
    Merging voltage/for-linus
    Merging security-testing/next
    Merging lblnet/master
    Merging quilt/ttydev
    Merging agp/agp-next
    Merging creds/creds-v4
    CONFLICT (content): Merge conflict in fs/ext4/balloc.c
    CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_cred.h
    CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_globals.h
    CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.h
    CONFLICT (content): Merge conflict in include/linux/security.h
    CONFLICT (content): Merge conflict in security/security.c
    CONFLICT (content): Merge conflict in security/selinux/hooks.c
    Merging oprofile/auto-oprofile-next
    Merging fastboot/auto-fastboot-next
    Merging sparseirq/auto-sparseirq-next
    Merging iommu/auto-iommu-next
    Merging uwb/for-upstream
    Merging watchdog/master
    Merging proc/proc
    Merging bdev/master
    Merging dwmw2-iommu/master
    Merging cpu_alloc/cpu_alloc
    CONFLICT (content): Merge conflict in kernel/lockdep.c
    CONFLICT (content): Merge conflict in kernel/module.c
    Merging userns/next
    Merging scsi-post-merge/master
    Merging master_tmp
    CONFLICT (content): Merge conflict in arch/mips/kernel/smp.c
    Applying sparc: qlogicpti fallout from sbus removal
    Applying Work around ld bug in older binutils
    Applying ftrace: rename FTRACE to FUNCTION_TRACER more successfully.
    Applying nfsctl: credentials error
    Applying coda: credentials error
    Applying cpu_alloc: per_cpu_offset is already defined for !CONFIG_SMP
    Applying ia64: Fix gru compiler warning

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

    iEYEARECAAYFAkkKuh0ACgkQjjKRsyhoI8zhEwCeI1+xBsJ5+m pbi8LCl7r+3STF
    sVEAni+2Jike31XMHr0Jm8Wh1ubpZEwO
    =BDMw
    -----END PGP SIGNATURE-----


  2. Re: linux-next: Tree for October 31 (repeat build failures)

    On Fri, 31 Oct 2008 18:56:13 +1100 Stephen Rothwell wrote:

    The only randconfig build failures that I see today (on i386 & x86_64)
    are repeats of:

    hp-plus undefined references:
    http://marc.info/?l=linux-next&m=122513607505680&w=2

    staging/go7007/go7007-v4l2:
    http://marc.info/?l=linux-next&m=122513515404158&w=2

    net/9p rdma_* undefined references with CONFIG_NET=y and CONFIG_INET=n:
    http://marc.info/?l=linux-next&m=122504699904105&w=2

    ---
    ~Randy
    --
    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. Re: linux-next: Tree for October 31

    On Fri, Oct 31, 2008 at 8:56 AM, Stephen Rothwell wrote:
    > 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).


    Hm, won't boot for me :-(

    [Linux-bzImage, setup=0x3000, size=0xfdbd90]

    BIOS EBDA/lowmem at: 0009fc00/0009fc00
    Initializing cgroup subsys cpuset
    Initializing cgroup subsys cpu
    Linux version 2.6.28-rc2-next-20081031 (vegard@localhost.localdomain) (gcc versi
    on 4.3.0 20080428 (Red Hat 4.3.0-8) (GCC) ) #59 SMP Sat Nov 1 08:01:36 CET 2008
    KERNEL supported cpus:
    Intel GenuineIntel
    AMD AuthenticAMD
    NSC Geode by NSC
    Cyrix CyrixInstead
    Centaur CentaurHauls
    Transmeta GenuineTMx86
    Transmeta TransmetaCPU
    UMC UMC UMC UMC
    BIOS-provided physical RAM map:
    BIOS-e820: 0000000000000000 - 000000000009fc00 (usable)
    BIOS-e820: 000000000009fc00 - 00000000000a0000 (reserved)
    BIOS-e820: 00000000000e6000 - 0000000000100000 (reserved)
    BIOS-e820: 0000000000100000 - 000000003ffc0000 (usable)
    BIOS-e820: 000000003ffc0000 - 000000003ffce000 (ACPI data)
    BIOS-e820: 000000003ffce000 - 000000003fff0000 (ACPI NVS)
    BIOS-e820: 000000003fff0000 - 0000000040000000 (reserved)
    BIOS-e820: 00000000fee00000 - 00000000fee01000 (reserved)
    BIOS-e820: 00000000ffb80000 - 0000000100000000 (reserved)
    console [earlyser0] enabled
    debug: ignoring loglevel setting.
    DMI 2.3 present.
    AMI BIOS detected: BIOS may corrupt low RAM, working it around.
    last_pfn = 0x3ffc0 max_arch_pfn = 0x100000
    x86 PAT enabled: cpu 0, old 0x7040600070406, new 0x7010600070106
    kernel direct mapping tables up to 373fe000 @ 100000-1e1000
    ACPI: RSDP 000F9380, 0014 (r0 ACPIAM)
    ACPI: RSDT 3FFC0000, 0034 (r1 A M I OEMRSDT 7000624 MSFT 97)
    ACPI: FACP 3FFC0200, 0084 (r2 A M I OEMFACP 7000624 MSFT 97)
    ACPI: DSDT 3FFC0430, 42F0 (r1 945P 945PA30 0 INTL 2002026)
    ACPI: FACS 3FFCE000, 0040
    ACPI: APIC 3FFC0390, 005C (r1 A M I OEMAPIC 7000624 MSFT 97)
    ACPI: MCFG 3FFC03F0, 003C (r1 A M I OEMMCFG 7000624 MSFT 97)
    ACPI: OEMB 3FFCE040, 0046 (r1 A M I AMI_OEM 7000624 MSFT 97)
    ACPI: Local APIC address 0xfee00000
    139MB HIGHMEM available.
    883MB LOWMEM available.
    mapped low ram: 0 - 373fe000
    low ram: 00000000 - 373fe000
    bootmap 00010000 - 00016e80
    (8 early reservations) ==> bootmem [0000000000 - 00373fe000]
    #0 [0000000000 - 0000001000] BIOS data page ==> [0000000000 - 0000001000]
    #1 [0000001000 - 0000002000] EX TRAMPOLINE ==> [0000001000 - 0000002000]
    #2 [0000006000 - 0000007000] TRAMPOLINE ==> [0000006000 - 0000007000]
    #3 [0000400000 - 0002915914] TEXT DATA BSS ==> [0000400000 - 0002915914]
    #4 [0002916000 - 0002932000] INIT_PG_TABLE ==> [0002916000 - 0002932000]
    #5 [000009fc00 - 0000100000] BIOS reserved ==> [000009fc00 - 0000100000]
    #6 [0000100000 - 00001c2000] PGTABLE ==> [0000100000 - 00001c2000]
    #7 [0000010000 - 0000017000] BOOTMAP ==> [0000010000 - 0000017000]
    found SMP MP-table at [c00ff780] 000ff780
    Zone PFN ranges:
    DMA 0x00000010 -> 0x00001000
    Normal 0x00001000 -> 0x000373fe
    HighMem 0x000373fe -> 0x0003ffc0
    Movable zone start PFN for each node
    early_node_map[2] active PFN ranges
    0: 0x00000010 -> 0x0000009f
    0: 0x00000100 -> 0x0003ffc0
    On node 0 totalpages: 261967
    free_area_init_node: node 0, pgdat c22fbf80, node_mem_map c2933380
    DMA zone: 56 pages used for memmap
    DMA zone: 0 pages reserved
    DMA zone: 3927 pages, LIFO batch:0
    Normal zone: 3038 pages used for memmap
    Normal zone: 219168 pages, LIFO batch:31
    HighMem zone: 490 pages used for memmap
    HighMem zone: 35288 pages, LIFO batch:7
    Movable zone: 0 pages used for memmap
    Using APIC driver default
    ACPI: PM-Timer IO Port: 0x808
    ACPI: Local APIC address 0xfee00000
    ACPI: LAPIC (acpi_id[0x01] lapic_id[0x00] enabled)
    ACPI: LAPIC (acpi_id[0x02] lapic_id[0x01] enabled)
    ACPI: IOAPIC (id[0x02] address[0xfec00000] gsi_base[0])
    IOAPIC[0]: apic_id 2, version 32, address 0xfec00000, GSI 0-23
    ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl)
    ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 high level)
    ACPI: IRQ0 used by override.
    ACPI: IRQ2 used by override.
    ACPI: IRQ9 used by override.
    Enabling APIC mode: Flat. Using 1 I/O APICs
    Using ACPI (MADT) for SMP configuration information
    SMP: Allowing 2 CPUs, 0 hotplug CPUs
    PM: Registered nosave memory: 000000000009f000 - 00000000000a0000
    PM: Registered nosave memory: 00000000000a0000 - 00000000000e6000
    PM: Registered nosave memory: 00000000000e6000 - 0000000000100000
    Allocating PCI resources starting at 50000000 (gap: 40000000:bee00000)
    BUG: Int 6: CR2 00000000
    EDI 01000000 ESI 00000000 EBP c2345f6c ESP c2345f0c
    EBX c23e3dac EDX 00000006 ECX 00000080 EAX c23e3dac
    err 00000000 EIP c2372d2a CS 00000060 flg 00010046
    Stack: c2345f74 c2372f3f 00000001 fffffeec 00000114 00000046 c2345fb0 c0465301
    00000080 00000000 c23e3dac 000000df c23e3dac 00001001 000373fe 00000000
    00000000 c23e3dac 01000000 00000000 c2345f98 c2372ff8 01000000 00000000
    Pid: 0, comm: swapper Not tainted 2.6.28-rc2-next-20081031 #59
    Call Trace:
    [] ? alloc_bootmem_core+0x49/0x2b2
    [] ? alloc_bootmem_core+0x25e/0x2b2
    [] ? vprintk+0x181/0x440
    [] ? ___alloc_bootmem_nopanic+0x65/0x91
    [] ? ___alloc_bootmem+0x16/0x3c
    [] ? ___alloc_bootmem+0x16/0x3c
    [] ? __alloc_bootmem+0x12/0x14
    [] ? cpu_alloc_init+0x4b/0x5d
    [] ? start_kernel+0xe9/0x3c1
    [] ? __init_begin+0x99/0xa1

    This is EIP:

    static void * __init alloc_bootmem_core(struct bootmem_data *bdata,
    unsigned long size, unsigned long align,
    unsigned long goal, unsigned long limit)
    {
    unsigned long fallback = 0;
    unsigned long min, max, start, sidx, midx, step;

    BUG_ON(!size); <-- HERE!

    ....coming from:

    void __init cpu_alloc_init(void)
    {
    base_percpu_in_units = (__per_cpu_end - __per_cpu_start
    + UNIT_SIZE - 1) / UNIT_SIZE;

    nr_units = PERCPU_AREA_SIZE / UNIT_SIZE - base_percpu_in_units;

    cpu_alloc_map = alloc_bootmem(BITS_TO_LONGS(nr_units)); <-- HERE!
    }

    ....looks to have been introduced in:

    commit 66f2d2c531e755656a5481fb92a9d137404d9f44
    Author: Christoph Lameter
    Date: Mon Oct 27 14:45:46 2008 -0500

    cpualloc: the allocator

    Adding to Cc.


    Vegard

    --
    "The animistic metaphor of the bug that maliciously sneaked in while
    the programmer was not looking is intellectually dishonest as it
    disguises that the error is the programmer's own creation."
    -- E. W. Dijkstra, EWD1036
    --
    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 October 31

    Could you do another pull to update things? I tracked down a couple of
    issues in the last days.


    --
    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 October 31

    Hi Christoph,

    On Mon, 3 Nov 2008 09:16:47 -0600 (CST) Christoph Lameter wrote:
    >
    > Could you do another pull to update things? I tracked down a couple of
    > issues in the last days.


    Thanks, will do (no linux-next today - public holiday).

    You are aware that I fetch all the trees before I build each linux-next?
    So a simple "That should be now fixed in the current tree" is sufficient.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/

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

    iEYEARECAAYFAkkPlyoACgkQjjKRsyhoI8wMLACeKPaoWkb/2ZBgyGmtvsT2kECo
    WDcAnRbhvedPieUjYQkZxzwnX/3rYypT
    =WvE2
    -----END PGP SIGNATURE-----


+ Reply to Thread