[lkml]   [2011]   [Aug]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: Tree for Aug 30
    Hi all,

    The powerpc allyesconfig build still fails today.

    Changes since 20110829:

    Changed tree: fbdev (new maintainer)
    Removed tree: fbdev-current
    Undropped tree: iommu

    Linus' tree lost one build failure.

    My fixes tree contains:
    remove remaining references to nfsservctl

    The s5p tree gained a conflict agains the arm (and arm-soc) tree.

    The scsi tree lost its build failure.

    The wireless tree gained a conflict agains Linus' tree.

    The rr tree gained a build failure so I used the version fron

    The iommu tree lost its build failure.

    I have still reverted the x86/spinlocks branch from the tip tree for

    The usb tree lost its conflict.

    The staging tree lost a conflict.

    The moduleh tree gained a conflict agains the scsi-rc-fixes tree.


    I have created today's linux-next tree at
    (patches at ). 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_DEBUG_INFO disabled when necessary.

    Below is a summary of the state of the merge.

    We are up to 200 trees (counting Linus' and 28 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 . 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 . Thanks to Frank Seidel.

    Stephen Rothwell

    $ git checkout master
    $ git reset --hard stable
    Merging origin/master
    Merging fixes/fixes
    Merging kbuild-current/rc-fixes
    Merging arm-current/master
    Merging m68k-current/for-linus
    Merging powerpc-merge/merge
    Merging 52xx-and-virtex-current/powerpc/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 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 devicetree-current/devicetree/merge
    Merging spi-current/spi/merge
    Merging arm/for-next
    Merging arm-lpae/for-next
    CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
    CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
    CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
    CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
    CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
    CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
    Merging arm-soc/for-next
    CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
    Merging at91/at91-next
    Merging davinci/davinci-next
    Merging i.MX/for-next
    Merging linux-spec/for-next
    Merging msm/for-next
    CONFLICT (content): Merge conflict in arch/arm/mach-msm/io.c
    Merging omap/for-next
    Merging pxa/for-next
    Merging samsung/next-samsung
    Merging s5p/for-next
    CONFLICT (delete/modify): arch/arm/mach-exynos4/mach-smdkc210.c deleted in s5p/for-next and modified in HEAD. Version HEAD of arch/arm/mach-exynos4/mach-smdkc210.c left in tree.
    $ git rm -f arch/arm/mach-exynos4/mach-smdkc210.c
    Applying: s5p: merge fixup for atags_offset use
    Merging tegra/for-next
    Merging ux500-core/ux500-core
    Merging xilinx/arm-next
    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 openrisc/for-upstream
    Merging parisc/for-next
    Merging powerpc/next
    Merging 4xx/next
    Merging 52xx-and-virtex/powerpc/next
    Merging galak/next
    Merging s390/features
    Merging sh/sh-latest
    Merging rmobile/rmobile-latest
    Merging sparc/master
    Merging tile/master
    Merging unicore32/unicore32
    Merging xtensa/master
    Merging ceph/for-next
    Merging cifs/master
    Merging configfs/linux-next
    Merging ecryptfs/next
    Merging ext3/for_next
    Merging ext4/dev
    Merging fatfs/master
    Merging fuse/for-next
    Merging gfs2/master
    Merging hfsplus/for-next
    Merging jfs/next
    Merging logfs/master
    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 vfs-scale/vfs-scale-working
    Merging pci/linux-next
    Merging hid/for-next
    CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
    CONFLICT (content): Merge conflict in drivers/hid/hid-ids.h
    Merging quilt/i2c
    Merging bjdooks-i2c/next-i2c
    Merging quilt/jdelvare-hwmon
    Merging hwmon-staging/hwmon-next
    Merging quilt/kernel-doc
    Merging docs/docs-move
    Merging v4l-dvb/master
    Merging kbuild/for-next
    Merging kconfig/for-next
    Merging ide/master
    Merging libata/NEXT
    Merging infiniband/for-next
    Merging acpi/test
    Merging idle-test/idle-test
    Merging powertools/tools-test
    Merging cpupowerutils/master
    Merging ieee1394/for-next
    Merging ubi/linux-next
    Merging dlm/next
    Merging swiotlb/master
    Merging ibft/master
    Merging scsi/master
    Merging iscsi-target/for-next
    Merging slave-dma/next
    CONFLICT (content): Merge conflict in drivers/dma/amba-pl08x.c
    Merging async_tx/next
    Merging net/master
    CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
    $ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
    Merging wireless/master
    CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-pci.c
    Merging bluetooth/master
    Merging mtd/master
    Merging l2-mtd/master
    CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
    Merging crypto/master
    Merging sound/for-next
    Merging sound-asoc/for-next
    Merging cpufreq/next
    Merging quilt/rr
    $ git reset --hard HEAD^
    Merging refs/next/20110829/rr
    Merging input/next
    Merging input-mt/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
    Merging hdlc/hdlc-next
    Merging drm/drm-next
    Merging fbdev/fbdev-next
    Merging viafb/viafb-next
    Merging omap_dss2/for-next
    Merging voltage/for-next
    Merging security/next
    CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
    Merging selinux/master
    Merging lblnet/master
    Merging agp/agp-next
    Merging watchdog/master
    Merging bdev/master
    Merging dwmw2-iommu/master
    Merging iommu/next
    Merging cputime/cputime
    Merging osd/linux-next
    Merging jc_docs/docs-next
    Merging nommu/master
    Merging trivial/for-next
    Merging audit/for-next
    Merging pm/linux-next
    CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
    CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h
    CONFLICT (content): Merge conflict in drivers/mfd/twl4030-irq.c
    Merging apm/for-next
    Merging fsnotify/for-next
    Merging irda/for-next
    Merging i7core_edac/linux_next
    Merging i7300_edac/linux_next
    CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
    Merging devicetree/devicetree/next
    CONFLICT (content): Merge conflict in drivers/of/base.c
    Merging spi/spi/next
    Merging gpio/gpio/next
    Merging tip/auto-latest
    CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
    [master 0ebf42b] Revert "Merge branch 'x86/spinlocks' into auto-latest"
    Merging rcu/rcu/next
    Merging kvm/linux-next
    Merging oprofile/for-next
    Merging ptrace/ptrace
    Merging xen/upstream/xen
    Merging xen-two/linux-next
    Merging xen-pvhvm/linux-next
    Merging edac-amd/for-next
    Merging percpu/for-next
    Merging workqueues/for-next
    Merging sfi/sfi-test
    Merging asm-generic/next
    Merging drivers-x86/linux-next
    Merging hwpoison/hwpoison
    Merging sysctl/master
    Merging namespace/master
    Merging regmap/for-next
    Merging driver-core/driver-core-next
    CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
    Merging tty/tty-next
    Merging usb/usb-next
    Merging staging/staging-next
    CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
    CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
    $ git rm -f drivers/staging/rtl8192e/r8192E_core.c
    Merging bkl-config/config
    Merging tmem/linux-next
    Merging writeback/next
    Merging arm-dt/devicetree/arm-next
    Merging moduleh/module.h-split
    CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
    CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
    CONFLICT (content): Merge conflict in include/linux/dmaengine.h
    Applying: dm: use export.h instead of module.h where possible
    Applying: block: bsg-lib.c needs export.h not module.h
    Applying: PM: EXPORT_SYMBOL needs export.h
    Merging kvmtool/master
    CONFLICT (content): Merge conflict in include/net/9p/9p.h
    Merging scsi-post-merge/merge-base:master
    $ git checkout akpm
    Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
    Applying: When no floppy is found the module code can be released while a timer
    Applying: Fix kconfig unmet dependency warning. BACKLIGHT_CLASS_DEVICE depends on
    Applying: Fix the following memory leak:
    Applying: The parameter's origin type is long. On an i386 architecture, it can
    Applying: Since the commit below which added O_PATH support to the *at() calls, the
    Applying: Add support for Aspire 1410 BIOS v1.3314. Fixes the following error:
    Applying: This makes the iris driver use the platform API, so it is properly exposed
    Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
    Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
    Applying: Cc: Ed Wildgoose <>
    Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
    Applying: The x86 timer interrupt handler is the only handler not traced in the
    Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
    Applying: Don't allow everybody to use a modem.
    Applying: The address limit is already set in flush_old_exec() so this
    Applying: A call to va_copy() should always be followed by a call to va_end() in the
    Applying: Don't dereference em if it's NULL or an error pointer.
    Applying: Some messing with error codes to return 0 on out id's and match
    Applying: kbuf is a buffer that is local to this function, so all of the error paths
    Applying: fb_set_suspend() must be called with the console semaphore held, which
    Applying: hwmon was using an idr with a NULL pointer, so convert to an
    Applying: A straightforward looking use of idr for a device id.
    Applying: This patchset aims at addressing /proc/stat issue which has been
    Applying: update_ts_time_stat currently updates idle time even if we are in iowait
    Applying: get_cpu_{idle,iowait}_time_us update idle/iowait counters unconditionally
    Applying: show_stat handler of the /proc/stat file relies on kstat_cpu(cpu)
    Applying: The address limit is already set in flush_old_exec() so this
    Applying: The address limit is already set in flush_old_exec() so this
    Applying: Add new check (assert_init) to make sure objects are initialized and
    Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
    Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
    Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
    Applying: The address limit is already set in flush_old_exec() so those calls to
    Applying: When do pci remove/rescan on system that have more iommus, got
    Applying: The current implementation of dmi_name_in_vendors() is an invitation to
    Applying: For headers that get exported to userland and make use of u32 style
    Applying: Fix sparse warnings of right shift bigger than source value size:
    Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
    Applying: Some mangling of errors was necessary to maintain current interface.
    Applying: This does involve additional use of the spin lock in idr.c. Is this an
    Applying: Instead of open coding this function use kstrtoul_from_user() directly.
    Applying: brd_make_request() always returns 0, which doesn't make much sense.
    Applying: The address limit is already set in flush_old_exec() so this assignment of
    Applying: Unbreak the alpha build.
    Applying: Unbreak alpha build.
    Applying: Unbreak alpha build.
    Applying: When we get corruption reports, it's useful to see if the kernel was
    Applying: When we get corruption reports, it's useful to see if the kernel was
    Applying: The basic idea behind cross memory attach is to allow MPI programs doing
    Applying: - Add x86_64 specific wire up
    Applying: > You might get some speed benefit by optimising for the small copies
    Applying: acct_isolated of compaction uses page_lru_base_type which returns only
    Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type. Normally,
    Applying: In async mode, compaction doesn't migrate dirty or writeback pages. So,
    Applying: In __zone_reclaim case, we don't want to shrink mapped page. Nonetheless,
    Applying: unmap_and_move() is one a big messy function. Clean it up.
    Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
    Applying: per-task block plug can reduce block queue lock contention and increase
    Applying: The tracing ring-buffer used this function briefly, but not anymore.
    Applying: After selecting a task to kill, the oom killer iterates all processes and
    Applying: Add the leading word "tmpfs" to the Kconfig string to make it blindingly
    Applying: When we get a bad_page bug report, it's useful to see what modules the
    Applying: Without swap, anonymous pages are not scanned. As such, they should not
    Applying: fix comment
    Applying: The nr_force_scan[] tuple holds the effective scan numbers for anon and
    Applying: Some kernel components pin user space memory (infiniband and perf) (by
    Applying: Add comments to explain the page statistics field in the mm_struct.
    Applying: add missing ;
    Applying: Testing from the XFS folk revealed that there is still too much I/O from
    Applying: Lumpy reclaim worked with two passes - the first which queued pages for IO
    Applying: Direct reclaim should never writeback pages. For now, handle the
    Applying: Direct reclaim should never writeback pages. Warn if an attempt is made.
    Applying: It is preferable that no dirty pages are dispatched for cleaning from the
    Applying: Workloads that are allocating frequently and writing files place a large
    Applying: When direct reclaim encounters a dirty page, it gets recycled around the
    Applying: It's possible a zone watermark is ok when entering the balance_pgdat()
    Applying: printk_ratelimit() should not be used, because it shares ratelimiting
    Applying: memchr_inv() is mainly used to check whether the whole buffer is filled
    Applying: Use newly introduced memchr_inv() for page verification.
    Applying: A shrinker function can return -1, means that it cannot do anything
    Applying: Use atomic-long operations instead of looping around cmpxchg().
    Applying: massage atomic.h inclusions
    Applying: The /proc/vmallocinfo shows information about vmalloc allocations in
    Applying: Commit 645747462435 ("vmscan: detect mapped file pages used only once")
    Applying: Logic added in commit 8cab4754d24a0 ("vmscan: make mapped executable pages
    Applying: SPARC32 require access to the start address. Add a new helper
    Applying: With the NO_BOOTMEM symbol added architectures may now use the following
    Applying: Using "- 1" relies on the old_end to be page aligned and PAGE_SIZE > 1,
    Applying: This replaces ptep_clear_flush() with ptep_get_and_clear() and a single
    Applying: This adds THP support to mremap (decreases the number of split_huge_page()
    Applying: coding-style nitpicking
    Applying: Cc: Andrea Arcangeli <>
    Applying: Signed-off-by: Andrew Morton <>
    Applying: vmstat_text is only available when PROC_FS or SYSFS is enabled. This
    Applying: reduce ifdeffery
    Applying: Signed-off-by: Andy Shevchenko <>
    Applying: Make the security_inode_init_security() initxattrs arg const, to match the
    Applying: The current implementation of the /dev/hpet driver couples opening the
    Applying: smp_call_function() only lets all other CPUs execute a specific function,
    Applying: auto_demotion_disable is called only for online CPUs. For hotplugged
    Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
    Applying: Strict user copy checks are only really supported on x86_32 even though
    Applying: The help text for this config is duplicated across the x86, parisc, and
    Applying: s/lib-/obj-/ for usercopy.o
    Applying: After an "unexpected" reboot, I found this Oops in my logs:
    Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
    Applying: Add axis correction for HP EliteBook 2730p.
    Applying: Add axis correction for HP EliteBook 8540w.
    Applying: Add axis correction for HP ProBook 6555b.
    Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
    Applying: Signed-off-by: Ilkka Koskinen <>
    Applying: Signed-off-by: Ilkka Koskinen <>
    Applying: Change exported functions to use the device given as parameter
    Applying: Signed-off-by: Ilkka Koskinen <>
    Applying: We are enabling some power features on medfield. To test suspend-2-RAM
    Applying: We are enabling some power features on medfield. To test suspend-2-RAM
    Applying: We are enabling some power features on medfield. To test suspend-2-RAM
    Applying: Cc: Al Viro <>
    Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
    Applying: include linux/module.h
    Applying: The memory for struct led_trigger should be kfreed in the
    Applying: Currently termination logic (\0 or \n\0) is hardcoded in _kstrtoull(),
    Applying: Add support for slice by 8 to existing crc32 algorithm. Also modify
    Applying: don't include asm/msr.h
    Applying: epoll can acquire recursively acquire ep->mtx on multiple "struct
    Applying: Currently in oprofilefs, files that use ulong_fops mis-handle writes of
    Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
    Applying: One can get this information from minix/inode.c, but adding the
    Applying: The memcg code sometimes uses "struct mem_cgroup *mem" and sometimes uses
    Applying: Before calling schedule_timeout(), task state should be changed.
    Applying: Signed-off-by: Bob Liu <>
    Applying: While back-porting Johannes Weiner's patch "mm: memcg-aware global
    Applying: If somebody is touching data too early, it might be easier to diagnose a
    Applying: Both mem_cgroup_charge_statistics() and mem_cgroup_move_account() were
    Applying: On reading sysctl dirs we should return -EISDIR instead of -EINVAL.
    Applying: Force this on for -next/mm testing purposes.
    Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
    Applying: After merging the akpm tree, today's linux-next build (lost of them)
    Applying: The discovered bit in PGCCSR register indicates if the device has been
    Applying: Add RapidIO mport driver for IDT TSI721 PCI Express-to-SRIO bridge device.
    Applying: When I tried to send a patch to remove it, Andi told me we still need to
    Applying: Signed-off-by: WANG Cong <>
    Applying: Signed-off-by: WANG Cong <>
    Applying: Signed-off-by: WANG Cong <>
    Applying: This is only an error, no need to use KERN_CRIT log level.
    Applying: Signed-off-by: WANG Cong <>
    Applying: ERROR: code indent should use tabs where possible
    Applying: A default echo function has been provided so it is no longer an error when
    Applying: This client driver allows you to use a GPIO pin as a source for PPS
    Applying: remove unneeded cast of void*
    Applying: Straightforward. As an aside, the ida_init calls are not needed as far as
    Applying: Simply creates one point to call the w1 interface.
    Applying: Adds a nolock function to the w1 interface to avoid locking the
    Applying: Fixes the deadlock when inserting and removing the ds2780.
    Merging akpm
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2011-08-30 09:19    [W:0.052 / U:44.564 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site