linux-next: Tree for April 9

linux-next: Tree for April 9

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 7167 bytes --]

Hi all,

There will not be another -next tree until April 14 (my time) due to
holidays here.

Changes since 20090408:

This tree will not build a powerpc allyesconfig.

Linus' tree lost 1 build failure.

The usb.current tree lost its build failure.

The tip-core tree gained a build failure on sparc64 for which a applied a
patch.

The block tree gained a build failure so I reverted a commit.

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

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/kernel/people/sfr/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 (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES) 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 132 trees (counting Linus' and 18 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 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/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
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
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging tracing/auto-tracing-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/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (add/add): Merge conflict in drivers/media/video/cx231xx/cx231xx-audio.c
Merging quota/for_next
CONFLICT (content): merge conflict in fs/quota/dquot.c
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
CONFLICT (content): Merge conflict in fs/ext4/inode.c
CONFLICT (content): Merge conflict in fs/reiserfs/namei.c
CONFLICT (content): Merge conflict in fs/reiserfs/stree.c
CONFLICT (content): Merge conflict in fs/udf/balloc.c
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
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 wireless/master
Merging mtd/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging quilt/rr
CONFLICT (content): Merge conflict in kernel/extable.c
CONFLICT (content): Merge conflict in kernel/module.c
CONFLICT (content): Merge conflict in kernel/params.c
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
[master 44623a9] Revert "Document and move the various READ/WRITE types"
Merging embedded/master
Merging firmware/master
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
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in drivers/serial/8250_pci.c
CONFLICT (content): Merge conflict in fs/devpts/inode.c
Merging agp/agp-next
Merging generic-ipi/auto-generic-ipi-next
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 bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging squashfs/master
Merging omap/for-next
Merging quilt/aoe
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slob.c
Merging suspend/linux-next
Merging quilt/driver-core
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
Applying: sparc64: update for restart_block size change
[master cbfae14] Revert "parport: Use the PCI IRQ if offered"

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Next April 9 : x86 allmodconfig media/video/cx88 build break

[Sachin Sant]

Today's Next tree allmodconfig build on x86 failed with

ERROR: __divdi3 [drivers/media/video/cx88/cx88xx.ko] undefined!

Thanks
-Sachin

-- 

---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------

Re: Next April 9 : x86 allmodconfig media/video/cx88 build break

[Mauro Carvalho Chehab]

On Thu, 09 Apr 2009 15:38:59 +0530
Sachin Sant <sachinp@in.ibm.com> wrote:

> Today's Next tree allmodconfig build on x86 failed with
> 
> ERROR: __divdi3 [drivers/media/video/cx88/cx88xx.ko] undefined!
> 
> Thanks
> -Sachin
> 
Hi Sachin,

Thanks for warning about this. This error happens only with some gcc versions.
Yet, I'm adding a patch to use do_div() to avoid such troubles. It should be
there for today's linux-next.

Cheers,
Mauro

[CFQ/OOPS] rb_erase with April 9 next tree

[Sachin Sant]

[-- Attachment #1: Type: text/plain, Size: 5209 bytes --]

I had Next 09 booted on a powerpc box and was compiling a kernel.
That's when i ran into this oops.

Unable to handle kernel paging request for data at address 0x00000010.
Faulting instruction address: 0xc0000000002ee1b0...................
0:mon> e
cpu 0x0: Vector: 300 (Data Access) at [c0000000d6cf63c0]
    pc: c0000000002ee1b0: .rb_erase+0x16c/0x3b4
    lr: c0000000002e14d0: .cfq_prio_tree_add+0x58/0x120
    sp: c0000000d6cf6640
   msr: 8000000000009032
   dar: 10
 dsisr: 40000000
  current = 0xc0000000fbdf5880
  paca    = 0xc000000000a92300
   pid   = 1867, comm = ld
0:mon> t
[c0000000d6cf66d0] c0000000002e14d0 .cfq_prio_tree_add+0x58/0x120
[c0000000d6cf6770] c0000000002e16c8 .__cfq_slice_expired+0xc8/0x11c
[c0000000d6cf6800] c0000000002e3920 .cfq_insert_request+0x374/0x3f4
[c0000000d6cf68a0] c0000000002cf448 .elv_insert+0x234/0x348
[c0000000d6cf6940] c0000000002d3348 .__make_request+0x514/0x5b0
[c0000000d6cf6a00] c0000000002d1348 .generic_make_request+0x430/0x4c8
[c0000000d6cf6b30] c0000000002d14dc .submit_bio+0xfc/0x124
[c0000000d6cf6bf0] c000000000156998 .submit_bh+0x14c/0x198
[c0000000d6cf6c80] c00000000015ba78 .block_read_full_page+0x394/0x40c
[c0000000d6cf7180] c000000000163080 .do_mpage_readpage+0x680/0x688
[c0000000d6cf7690] c000000000163200 .mpage_readpages+0x104/0x190
[c0000000d6cf77f0] c0000000001e2aac .ext3_readpages+0x28/0x40
[c0000000d6cf7870] c0000000000ebd20 .__do_page_cache_readahead+0x180/0x278
[c0000000d6cf7960] c0000000000ec16c .ondemand_readahead+0x1ac/0x1d8
[c0000000d6cf7a00] c0000000000e1f28 .generic_file_aio_read+0x260/0x6b0
[c0000000d6cf7b40] c000000000129f74 .do_sync_read+0xcc/0x130
[c0000000d6cf7ce0] c00000000012af44 .vfs_read+0xd0/0x1bc
[c0000000d6cf7d80] c00000000012b138 .SyS_read+0x58/0xa0
[c0000000d6cf7e30] c0000000000084ac syscall_exit+0x0/0x40
--- Exception: c01 (System Call) at 000004000050a854
SP (fffd455e850) is in userspace
0:mon> di %pc
c0000000002ee1b0  e95f0010      ld      r10,16(r31)
c0000000002ee1b4  7faa4000      cmpd    cr7,r10,r8
c0000000002ee1b8  409e00ec      bne     cr7,c0000000002ee2a4    # .rb_erase+0x260/0x3b4
c0000000002ee1bc  e95f0008      ld      r10,8(r31)
c0000000002ee1c0  e80a0000      ld      r0,0(r10)
c0000000002ee1c4  780907e1      clrldi. r9,r0,63
c0000000002ee1c8  40820028      bne     c0000000002ee1f0        # .rb_erase+0x1ac/0x3b4
c0000000002ee1cc  60000001      ori     r0,r0,1
c0000000002ee1d0  7fe3fb78      mr      r3,r31
c0000000002ee1d4  7fa4eb78      mr      r4,r29
c0000000002ee1d8  f80a0000      std     r0,0(r10)
c0000000002ee1dc  e81f0000      ld      r0,0(r31)
c0000000002ee1e0  780007a4      rldicr  r0,r0,0,62
c0000000002ee1e4  f81f0000      std     r0,0(r31)
c0000000002ee1e8  4bfffbfd      bl      c0000000002edde4        # .__rb_rotate_left+0x0/0x7c
c0000000002ee1ec  e95f0008      ld      r10,8(r31)
0:mon> di %ld
invalid register name '%ld'
c0000000002ee1f0  e96a0010      ld      r11,16(r10)
c0000000002ee1f4  2fab0000      cmpdi   cr7,r11,0
c0000000002ee1f8  419e0010      beq     cr7,c0000000002ee208    # .rb_erase+0x1c4/0x3b4
c0000000002ee1fc  e80b0000      ld      r0,0(r11)
c0000000002ee200  780907e1      clrldi. r9,r0,63
c0000000002ee204  4182001c      beq     c0000000002ee220        # .rb_erase+0x1dc/0x3b4
c0000000002ee208  e92a0008      ld      r9,8(r10)
c0000000002ee20c  2fa90000      cmpdi   cr7,r9,0
c0000000002ee210  419e00f4      beq     cr7,c0000000002ee304    # .rb_erase+0x2c0/0x3b4
c0000000002ee214  e8090000      ld      r0,0(r9)
c0000000002ee218  780907e1      clrldi. r9,r0,63
c0000000002ee21c  408200e8      bne     c0000000002ee304        # .rb_erase+0x2c0/0x3b4
c0000000002ee220  e92a0008      ld      r9,8(r10)
c0000000002ee224  2fa90000      cmpdi   cr7,r9,0
c0000000002ee228  419e0010      beq     cr7,c0000000002ee238    # .rb_erase+0x1f4/0x3b4
c0000000002ee22c  e8090000      ld      r0,0(r9)
0:mon>
R00 = c0000000fbc07330   R16 = c0000000006d2c92
R01 = c0000000d6cf6640   R17 = 0000000000000000
R02 = c0000000009986e8   R18 = 0000000000000004
R03 = c0000000f93620b0   R19 = c0000000d6cf6a90
R04 = c0000000fb8af038   R20 = c0000000d6cf6a70
R05 = fffffffffffffff0   R21 = 0000000000800000
R06 = 0000000000000001   R22 = 0000000004334ff2
R07 = c0000000f936a210   R23 = 0000000000800005
R08 = c0000000f936a210   R24 = c0000000fbaf0000
R09 = 0000000000000001   R25 = 0000000000000000
R10 = c0000000fbc09130   R26 = c0000000fbb0e490
R11 = 0000000000000000   R27 = c0000000fb8af000
R12 = c0000000dd7e3800   R28 = c0000000fb8af038
R13 = c000000000a92300   R29 = c0000000fb8af038
R14 = 0000000000010000   R30 = c000000000923360
R15 = 0000000000000001   R31 = 0000000000000000
pc  = c0000000002ee1b0 .rb_erase+0x16c/0x3b4
lr  = c0000000002e14d0 .cfq_prio_tree_add+0x58/0x120
msr = 8000000000009032   cr  = 44004448
ctr = c0000000002e35ac   xer = 0000000000000001   trap =  300
dar = 0000000000000010   dsisr = 40000000

On subsequent reboots, i observed similar oops during bootup.
I have attached the oops message here.

Let me know if i can provide any other information.

Thanks
-Sachin


-- 

---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------


[-- Attachment #2: oops_message --]
[-- Type: text/plain, Size: 2996 bytes --]

Oops: Kernel access of bad area, sig: 11 [#1]
SMP NR_CPUS=1024 NUMA pSeries
Modules linked in: ipv6(F) fuse(F) loop(F) dm_mod(F) ehea(F)
NIP: c0000000002ee1b0 LR: c0000000002e14d0 CTR: c0000000002e35ac
REGS: c0000000f20d2940 TRAP: 0300   Tainted: GF           (2.6.30-rc1-next-20090409)
MSR: 8000000000009032 <EE,ME,IR,DR>  CR: 44024448  XER: 00000001
DAR: 0000000000000010, DSISR: 0000000040000000
TASK = c0000000f9346a00[3684] 'sh' THREAD: c0000000f20d0000 CPU: 1
GPR00: c0000000f941f030 c0000000f20d2bc0 c0000000009986e8 c0000000fbe91c50 
GPR04: c0000000fb8af038 fffffffffffffff0 0000000000000001 c0000000f941edb0 
GPR08: c0000000f941edb0 0000000000000001 c0000000fbb3cb50 0000000000000000 
GPR12: c0000000f975ed00 c000000000a92500 c0000000f20d0080 c0000000f20d34c0 
GPR16: c0000000006d2c92 0000000000000000 0000000000000004 c0000000f20d3010 
GPR20: c0000000f20d2ff0 0000000000800000 0000000002c8bc82 0000000000800005 
GPR24: c0000000fbaf0000 0000000000000000 c0000000f98ef010 c0000000fb8af000 
GPR28: c0000000fb8af038 c0000000fb8af038 c000000000923360 0000000000000000 
NIP [c0000000002ee1b0] .rb_erase+0x16c/0x3b4
LR [c0000000002e14d0] .cfq_prio_tree_add+0x58/0x120
Call Trace:
[c0000000f20d2bc0] [c0000000002e1450] .cfq_service_tree_add+0x23c/0x264 (unreliable)
[c0000000f20d2c50] [c0000000002e14d0] .cfq_prio_tree_add+0x58/0x120
[c0000000f20d2cf0] [c0000000002e16c8] .__cfq_slice_expired+0xc8/0x11c
[c0000000f20d2d80] [c0000000002e3920] .cfq_insert_request+0x374/0x3f4
[c0000000f20d2e20] [c0000000002cf448] .elv_insert+0x234/0x348
[c0000000f20d2ec0] [c0000000002d3348] .__make_request+0x514/0x5b0
[c0000000f20d2f80] [c0000000002d1348] .generic_make_request+0x430/0x4c8
[c0000000f20d30b0] [c0000000002d14dc] .submit_bio+0xfc/0x124
[c0000000f20d3170] [c000000000156998] .submit_bh+0x14c/0x198
[c0000000f20d3200] [c000000000158814] .bh_submit_read+0x70/0xd0
[c0000000f20d3290] [c0000000001dbf6c] .read_block_bitmap+0xb8/0x238
[c0000000f20d3330] [c0000000001dc2d4] .ext3_free_blocks_sb+0x178/0x5e4
[c0000000f20d3450] [c0000000001dc780] .ext3_free_blocks+0x40/0xe4
[c0000000f20d34e0] [c0000000001e3e70] .ext3_clear_blocks+0x1d8/0x21c
[c0000000f20d35a0] [c0000000001e3fcc] .ext3_free_data+0x118/0x190
[c0000000f20d3650] [c0000000001e49c0] .ext3_truncate+0x670/0xa80
[c0000000f20d37b0] [c0000000000fda70] .vmtruncate+0xf0/0x134
[c0000000f20d3850] [c0000000001457c0] .inode_setattr+0x44/0x180
[c0000000f20d38f0] [c0000000001e15e8] .ext3_setattr+0x1ec/0x298
[c0000000f20d39a0] [c000000000145afc] .notify_change+0x200/0x3dc
[c0000000f20d3a60] [c00000000012905c] .do_truncate+0x84/0xbc
[c0000000f20d3b40] [c000000000137630] .may_open+0x1fc/0x2f4
[c0000000f20d3be0] [c00000000013a5c4] .do_filp_open+0x400/0x95c
[c0000000f20d3d80] [c000000000127e68] .do_sys_open+0x80/0x140
[c0000000f20d3e30] [c0000000000084ac] syscall_exit+0x0/0x40
Instruction dump:
e8090010 7fa01800 409e000c f9090010 48000010 f9090008 48000008 f91d0000 
2f860001 7cff3b78 409e0238 48000200 <e95f0010> 7faa4000 409e00ec e95f0008 

Re: [CFQ/OOPS] rb_erase with April 9 next tree

[Jens Axboe]

On Thu, Apr 09 2009, Sachin Sant wrote:
> I had Next 09 booted on a powerpc box and was compiling a kernel.
> That's when i ran into this oops.
>
> Unable to handle kernel paging request for data at address 0x00000010.
> Faulting instruction address: 0xc0000000002ee1b0...................
> 0:mon> e
> cpu 0x0: Vector: 300 (Data Access) at [c0000000d6cf63c0]
>    pc: c0000000002ee1b0: .rb_erase+0x16c/0x3b4
>    lr: c0000000002e14d0: .cfq_prio_tree_add+0x58/0x120
>    sp: c0000000d6cf6640
>   msr: 8000000000009032
>   dar: 10
> dsisr: 40000000
>  current = 0xc0000000fbdf5880
>  paca    = 0xc000000000a92300
>   pid   = 1867, comm = ld
> 0:mon> t
> [c0000000d6cf66d0] c0000000002e14d0 .cfq_prio_tree_add+0x58/0x120
> [c0000000d6cf6770] c0000000002e16c8 .__cfq_slice_expired+0xc8/0x11c
> [c0000000d6cf6800] c0000000002e3920 .cfq_insert_request+0x374/0x3f4
> [c0000000d6cf68a0] c0000000002cf448 .elv_insert+0x234/0x348
> [c0000000d6cf6940] c0000000002d3348 .__make_request+0x514/0x5b0
> [c0000000d6cf6a00] c0000000002d1348 .generic_make_request+0x430/0x4c8
> [c0000000d6cf6b30] c0000000002d14dc .submit_bio+0xfc/0x124
> [c0000000d6cf6bf0] c000000000156998 .submit_bh+0x14c/0x198
> [c0000000d6cf6c80] c00000000015ba78 .block_read_full_page+0x394/0x40c
> [c0000000d6cf7180] c000000000163080 .do_mpage_readpage+0x680/0x688
> [c0000000d6cf7690] c000000000163200 .mpage_readpages+0x104/0x190
> [c0000000d6cf77f0] c0000000001e2aac .ext3_readpages+0x28/0x40
> [c0000000d6cf7870] c0000000000ebd20 .__do_page_cache_readahead+0x180/0x278
> [c0000000d6cf7960] c0000000000ec16c .ondemand_readahead+0x1ac/0x1d8
> [c0000000d6cf7a00] c0000000000e1f28 .generic_file_aio_read+0x260/0x6b0
> [c0000000d6cf7b40] c000000000129f74 .do_sync_read+0xcc/0x130
> [c0000000d6cf7ce0] c00000000012af44 .vfs_read+0xd0/0x1bc
> [c0000000d6cf7d80] c00000000012b138 .SyS_read+0x58/0xa0
> [c0000000d6cf7e30] c0000000000084ac syscall_exit+0x0/0x40

Just ran into this myself, too. I'll pull that bad patch from -next
asap. I wont be able to fix this before next week.

-- 
Jens Axboe

Re: [CFQ/OOPS] rb_erase with April 9 next tree

[Jens Axboe]

On Thu, Apr 09 2009, Jens Axboe wrote:
> On Thu, Apr 09 2009, Sachin Sant wrote:
> > I had Next 09 booted on a powerpc box and was compiling a kernel.
> > That's when i ran into this oops.
> >
> > Unable to handle kernel paging request for data at address 0x00000010.
> > Faulting instruction address: 0xc0000000002ee1b0...................
> > 0:mon> e
> > cpu 0x0: Vector: 300 (Data Access) at [c0000000d6cf63c0]
> >    pc: c0000000002ee1b0: .rb_erase+0x16c/0x3b4
> >    lr: c0000000002e14d0: .cfq_prio_tree_add+0x58/0x120
> >    sp: c0000000d6cf6640
> >   msr: 8000000000009032
> >   dar: 10
> > dsisr: 40000000
> >  current = 0xc0000000fbdf5880
> >  paca    = 0xc000000000a92300
> >   pid   = 1867, comm = ld
> > 0:mon> t
> > [c0000000d6cf66d0] c0000000002e14d0 .cfq_prio_tree_add+0x58/0x120
> > [c0000000d6cf6770] c0000000002e16c8 .__cfq_slice_expired+0xc8/0x11c
> > [c0000000d6cf6800] c0000000002e3920 .cfq_insert_request+0x374/0x3f4
> > [c0000000d6cf68a0] c0000000002cf448 .elv_insert+0x234/0x348
> > [c0000000d6cf6940] c0000000002d3348 .__make_request+0x514/0x5b0
> > [c0000000d6cf6a00] c0000000002d1348 .generic_make_request+0x430/0x4c8
> > [c0000000d6cf6b30] c0000000002d14dc .submit_bio+0xfc/0x124
> > [c0000000d6cf6bf0] c000000000156998 .submit_bh+0x14c/0x198
> > [c0000000d6cf6c80] c00000000015ba78 .block_read_full_page+0x394/0x40c
> > [c0000000d6cf7180] c000000000163080 .do_mpage_readpage+0x680/0x688
> > [c0000000d6cf7690] c000000000163200 .mpage_readpages+0x104/0x190
> > [c0000000d6cf77f0] c0000000001e2aac .ext3_readpages+0x28/0x40
> > [c0000000d6cf7870] c0000000000ebd20 .__do_page_cache_readahead+0x180/0x278
> > [c0000000d6cf7960] c0000000000ec16c .ondemand_readahead+0x1ac/0x1d8
> > [c0000000d6cf7a00] c0000000000e1f28 .generic_file_aio_read+0x260/0x6b0
> > [c0000000d6cf7b40] c000000000129f74 .do_sync_read+0xcc/0x130
> > [c0000000d6cf7ce0] c00000000012af44 .vfs_read+0xd0/0x1bc
> > [c0000000d6cf7d80] c00000000012b138 .SyS_read+0x58/0xa0
> > [c0000000d6cf7e30] c0000000000084ac syscall_exit+0x0/0x40
> 
> Just ran into this myself, too. I'll pull that bad patch from -next
> asap. I wont be able to fix this before next week.

Can you see if this fixes it for you?

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index e01b103..64de5c0 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1654,6 +1654,7 @@ retry:
 		}
 
 		RB_CLEAR_NODE(&cfqq->rb_node);
+		RB_CLEAR_NODE(&cfqq->p_node);
 		INIT_LIST_HEAD(&cfqq->fifo);
 
 		atomic_set(&cfqq->ref, 0);

-- 
Jens Axboe

Re: [CFQ/OOPS] rb_erase with April 9 next tree

[Sachin Sant]

Jens Axboe wrote:
>
> Can you see if this fixes it for you?
>
> diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
> index e01b103..64de5c0 100644
> --- a/block/cfq-iosched.c
> +++ b/block/cfq-iosched.c
> @@ -1654,6 +1654,7 @@ retry:
>  		}
>
>  		RB_CLEAR_NODE(&cfqq->rb_node);
> +		RB_CLEAR_NODE(&cfqq->p_node);
>  		INIT_LIST_HEAD(&cfqq->fifo);
>
>  		atomic_set(&cfqq->ref, 0);
>   
Yes. The above patch fixed this oops. Thanks

Regards
-Sachin

-- 

---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------

Re: linux-next: Tree for April 9

[Andrew Morton]

On Thu, 9 Apr 2009 16:33:05 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git

It has a link failure with i386 allmodconfig due to missing __divdi3.

It's due to this statement in drivers/media/video/cx88/cx88-dsp.c's
int_goertzel():

        return (u32)(((s64)s_prev2*s_prev2 + (s64)s_prev*s_prev -
                      (s64)coeff*s_prev2*s_prev/32768)/N/N);

that gem will need to be converted to use div64() or similar, please.

Re: linux-next: Tree for April 9

[Mauro Carvalho Chehab]

On Fri, 10 Apr 2009 23:11:58 -0700
Andrew Morton <akpm@linux-foundation.org> wrote:

> On Thu, 9 Apr 2009 16:33:05 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > I have created today's linux-next tree at
> > git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
> 
> It has a link failure with i386 allmodconfig due to missing __divdi3.
> 
> It's due to this statement in drivers/media/video/cx88/cx88-dsp.c's
> int_goertzel():
> 
>         return (u32)(((s64)s_prev2*s_prev2 + (s64)s_prev*s_prev -
>                       (s64)coeff*s_prev2*s_prev/32768)/N/N);
> 
> that gem will need to be converted to use div64() or similar, please.

Updated to use do_div().


Cheers,
Mauro

Re: linux-next: Tree for April 9

[Stephen Rothwell]

Hi Mauro,

On Sat, 11 Apr 2009 08:09:53 -0300 Mauro Carvalho Chehab <mchehab@infradead.org> wrote:
>
> On Fri, 10 Apr 2009 23:11:58 -0700
> Andrew Morton <akpm@linux-foundation.org> wrote:
> 
> > On Thu, 9 Apr 2009 16:33:05 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > > I have created today's linux-next tree at
> > > git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
> > 
> > It has a link failure with i386 allmodconfig due to missing __divdi3.
> > 
> > It's due to this statement in drivers/media/video/cx88/cx88-dsp.c's
> > int_goertzel():
> > 
> >         return (u32)(((s64)s_prev2*s_prev2 + (s64)s_prev*s_prev -
> >                       (s64)coeff*s_prev2*s_prev/32768)/N/N);
> > 
> > that gem will need to be converted to use div64() or similar, please.
> 
> Updated to use do_div().

Thank you.  It will be included in next-20090414.

Andrew, I have included the patch below in case you need it before then.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

commit ec0a97d2dd33e156283dd04c37d77603cb4dbaf7
Author: Miroslav Sustek <sustmidown@centrum.cz>
Date:   Mon Apr 6 20:07:04 2009 -0300

    V4L/DVB (11441): cx88-dsp: fixing 64bit math
    
    cx88-dsp: fixing 64bit math on 32bit kernels
    
    Some gcc versions report the missing of __divdi3
    
    Signed-off-by: Miroslav Sustek <sustmidown@centrum.cz>
    [mchehab.redhat.com: CodingStyle fixes]
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/cx88/cx88-dsp.c b/drivers/media/video/cx88/cx88-dsp.c
index a78286e..3e5eaf3 100644
--- a/drivers/media/video/cx88/cx88-dsp.c
+++ b/drivers/media/video/cx88/cx88-dsp.c
@@ -22,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/jiffies.h>
+#include <asm/div64.h>
 
 #include "cx88.h"
 #include "cx88-reg.h"
@@ -100,13 +101,25 @@ static u32 int_goertzel(s16 x[], u32 N, u32 freq)
 	s32 s_prev2 = 0;
 	s32 coeff = 2*int_cos(freq);
 	u32 i;
+
+	u64 tmp;
+	u32 divisor;
+
 	for (i = 0; i < N; i++) {
 		s32 s = x[i] + ((s64)coeff*s_prev/32768) - s_prev2;
 		s_prev2 = s_prev;
 		s_prev = s;
 	}
-	return (u32)(((s64)s_prev2*s_prev2 + (s64)s_prev*s_prev -
-		      (s64)coeff*s_prev2*s_prev/32768)/N/N);
+
+	tmp = (s64)s_prev2 * s_prev2 + (s64)s_prev * s_prev -
+		      (s64)coeff * s_prev2 * s_prev / 32768;
+
+	/* XXX: N must be low enough so that N*N fits in s32.
+	 * Else we need two divisions. */
+	divisor = N * N;
+	do_div(tmp, divisor);
+
+	return (u32) tmp;
 }
 
 static u32 freq_magnitude(s16 x[], u32 N, u32 freq)

linux-next: Tree for April 9

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 10419 bytes --]

Hi all,

Changes since 20100408:

Dropped tree: tmio-mmc (long unresolved conflicts and unable to fetch)
	hwlat (at the maintainers request)

My fixes tree contains:
	a patch for a pktcdvd build error from Arnd Bergmann

The s390 tree lost its conflict.

The kvm tree still lost its build failure.

The net tree lost 3 conflicts and its build failure, but gained another
conflict against Linus' tree.

The wireless tree lost 3 conflicts, but gained another against the
wireless-current tree.

The mtd tree lost its build failure.

The drm tree lost its a build failure.

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

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 160 trees (counting Linus' and 22 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 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
Applying: ar9170: fix for driver-core ABI change
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/for-linus
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
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 gcl-current/merge
Merging arm/devel
Applying: arm: update gfp/slab.h includes
Merging davinci/davinci-next
Applying: davinci: update gfp/slab.h includes
Merging i.MX/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-mx3/devices.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx3/devices.h
CONFLICT (content): Merge conflict in arch/arm/mach-mx3/mx31lite-db.c
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
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/master
Merging genesis/master
Merging sparc/master
Merging xtensa/master
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 jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Applying: ocfs2: update gfp/slab.h includes
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
CONFLICT (content): Merge conflict in fs/9p/vfs_super.c
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
CONFLICT (content): Merge conflict in fs/namei.c
CONFLICT (content): Merge conflict in fs/nfs/inode.c
CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c
CONFLICT (content): Merge conflict in fs/nfsd/vfs.c
CONFLICT (content): Merge conflict in fs/ufs/inode.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c
CONFLICT (content): Merge conflict in security/tomoyo/realpath.c
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/meye.c
CONFLICT (content): Merge conflict in drivers/media/video/soc_camera.c
CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-audio-upstream.c
Applying: v4l-dvb: update gfp/slab.h includes
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Applying: acpi: update gfp/slab.h includes
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/stmmac/stmmac_main.c
CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_cmd.c
CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_main.c
CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_spi.c
CONFLICT (content): Merge conflict in net/core/ethtool.c
CONFLICT (content): Merge conflict in net/mac80211/scan.c
Merging wireless/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath5k/phy.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-4965.c
Applying: wireless: update gfp/slab.h includes
Merging mtd/master
Applying: mtd: update gfp/slab.h includes
Merging crypto/master
Merging sound/for-next
CONFLICT (delete/modify): sound/soc/codecs/ad1938.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/soc/codecs/ad1938.c left in tree.
$ git rm -f sound/soc/codecs/ad1938.c
Applying: sound: ASoC; merge fixup for slab.h changes
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h
CONFLICT (content): Merge conflict in scripts/mod/file2alias.c
Merging mmc/next
Merging input/next
CONFLICT (content): Merge conflict in drivers/char/sysrq.c
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/net/pcmcia/3c589_cs.c
CONFLICT (content): Merge conflict in drivers/pcmcia/pcmcia_resource.c
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Applying: kgdb: update for sysrq handling change
Applying: kdb: update gfp/slab.h includes
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (add/add): Merge conflict in drivers/dma/timb_dma.c
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r300.c
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
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
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c
CONFLICT (content): Merge conflict in include/linux/fsnotify.h
CONFLICT (content): Merge conflict in kernel/audit_tree.c
CONFLICT (content): Merge conflict in kernel/audit_watch.c
CONFLICT (content): Merge conflict in kernel/sysctl.c
Applying: fsnotify: update gfp/slab.h includes
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging drbd/for-jens
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Applying: vbus: use of kzalloc/kfree requires the include of slab.h
Applying: vbus: update gfp/slab.h includes
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging limits/writable_limits
CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h
CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S
Merging omap_dss2/for-next
Merging tip/auto-latest
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/platform.c
Merging quilt/tty
Merging quilt/usb
Applying: usb: update gfp/slab.h includes
Merging quilt/staging
Applying: staging: update gfp/slab.h includes
Merging slabh/slabh
Merging scsi-post-merge/master

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: Tree for April 9

[Stefan Richter]

Ingo Molnar wrote:
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
>> On Thu, 10 Apr 2008 08:52:27 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>> >
>> > what type of conflict do you have there? If it's a new entry then 
>> > you might be able to fix it by moving the new entry elsewhere in the 
>> > file. Or if i introduced a new entry close to an existing entry you 
>> > modify then i could move my new entry elsewhere.
>> 
>> Commit 523a65f1a7a339e528ca6d6d808516fe195fde03 ("firewire: fw-ohci: 
>> add option for remote debugging") in the ieee1394 tree adds a new 
>> entry just where the sched tree adds
>> 
>> source kernel/trace/Kconfig
> 
> hm, i think in this specific case the new firewire entry should be added 
> after the PROVIDE_OHCI1394_DMA_INIT section. (that's how we extend 
> groups of Kconfig entries anyway) The new trace entries in the scheduler 
> tree follow that pattern and add the new kernel/trace/Kconfig at the 
> right place. So if the firewire entry is added that way this conflict 
> could be avoided.

Indeed, this order of the two options looks more logical now that you
say it.  Update patch will appear on LKML in a minute.

Stephen will still have a conflict in lib/Kconfig.debug when merging the
tests tree, but this happens regardless what we two do because tests is
based on 2.6.25-rc1, and mainline Kconfig.debug has changes post -rc1.
-- 
Stefan Richter
-=====-==--- -=-- -=-=-
http://arcgraph.de/sr/

Re: linux-next: Tree for April 9

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> On Thu, 10 Apr 2008 08:52:27 +0200 Ingo Molnar <mingo@elte.hu> wrote:
> >
> > what type of conflict do you have there? If it's a new entry then 
> > you might be able to fix it by moving the new entry elsewhere in the 
> > file. Or if i introduced a new entry close to an existing entry you 
> > modify then i could move my new entry elsewhere.
> 
> Commit 523a65f1a7a339e528ca6d6d808516fe195fde03 ("firewire: fw-ohci: 
> add option for remote debugging") in the ieee1394 tree adds a new 
> entry just where the sched tree adds
> 
> source kernel/trace/Kconfig

hm, i think in this specific case the new firewire entry should be added 
after the PROVIDE_OHCI1394_DMA_INIT section. (that's how we extend 
groups of Kconfig entries anyway) The new trace entries in the scheduler 
tree follow that pattern and add the new kernel/trace/Kconfig at the 
right place. So if the firewire entry is added that way this conflict 
could be avoided.

	Ingo

Re: linux-next: Tree for April 9

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 658 bytes --]

On Thu, 10 Apr 2008 08:52:27 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> what type of conflict do you have there? If it's a new entry then you 
> might be able to fix it by moving the new entry elsewhere in the file. 
> Or if i introduced a new entry close to an existing entry you modify 
> then i could move my new entry elsewhere.

Commit 523a65f1a7a339e528ca6d6d808516fe195fde03 ("firewire: fw-ohci: add
option for remote debugging") in the ieee1394 tree adds a new entry just
where the sched tree adds

source kernel/trace/Kconfig

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: linux-next: Tree for April 9

[Ingo Molnar]

* Stefan Richter <stefanr@s5r6.in-berlin.de> wrote:

> Stephen Rothwell wrote:
> > There were a few merge conflicts (fairly trivial) and couple of build
> > failures (notified).  There is a know build failure with powerpc
> > allyesconfig.  Below is a summary of the state of the merge.
> ...
> > Merging ieee1394/for-next
> > CONFLICT (content): Merge conflict in lib/Kconfig.debug
> 
> Would it be safe for me (and preferred by you) to merge sched/for-akpm 
> into ieee1394/for-next to resolve this conflict until next mainline 
> merge?

what type of conflict do you have there? If it's a new entry then you 
might be able to fix it by moving the new entry elsewhere in the file. 
Or if i introduced a new entry close to an existing entry you modify 
then i could move my new entry elsewhere.

	Ingo

Re: linux-next: Tree for April 9

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1050 bytes --]

Hi Stefan,

On Wed, 09 Apr 2008 18:55:42 +0200 Stefan Richter <stefanr@s5r6.in-berlin.de> wrote:
>
> Stephen Rothwell wrote:
> > There were a few merge conflicts (fairly trivial) and couple of build
> > failures (notified).  There is a know build failure with powerpc
> > allyesconfig.  Below is a summary of the state of the merge.
> ...
> > Merging ieee1394/for-next
> > CONFLICT (content): Merge conflict in lib/Kconfig.debug
> 
> Would it be safe for me (and preferred by you) to merge sched/for-akpm
> into ieee1394/for-next to resolve this conflict until next mainline merge?

Actually, no, as sched/for-akpm gets rebased sometimes.  I only have to
fix these trivial conflicts once as "git rerere" remembers the fix for me
and they are so trivial that Linus will probably fix them the same way
when he finally merges your tree.  Also, there is the possibility that he
will merge your tree before sched/for-akpm ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: linux-next: Tree for April 9

[Stefan Richter]

Stephen Rothwell wrote:
> There were a few merge conflicts (fairly trivial) and couple of build
> failures (notified).  There is a know build failure with powerpc
> allyesconfig.  Below is a summary of the state of the merge.
...
> Merging ieee1394/for-next
> CONFLICT (content): Merge conflict in lib/Kconfig.debug

Would it be safe for me (and preferred by you) to merge sched/for-akpm
into ieee1394/for-next to resolve this conflict until next mainline merge?
-- 
Stefan Richter
-=====-==--- -=-- -=--=
http://arcgraph.de/sr/

Re: linux-next: Tree for April 9

[Cyrill Gorcunov]

[Ingo Molnar - Wed, Apr 09, 2008 at 05:03:33PM +0200]
| 
| * Cyrill Gorcunov <gorcunov@gmail.com> wrote:
| 
| > | > It seems that commit 883a9fc4e5d9b0701f15d4e5a23608f942104721 
| > | > ("x86: cleanup - rename VM_MASK to X86_VM_MASK") from the x86 tree 
| > | > seems to have missed some places.
| > | 
| > | i think what happened is that some changes came in from other trees 
| > | that reintroduced the old symbols?
| > 
| > actually, that is the only explanation I could find. The last time I 
| > sent you patches to fixup *all* VM_MASK (wich were grep'ed on *latest 
| > branch over *all* sources inside x86). So this all were settled down 
| > by a few of my patches and /for shame on me/ yours fixups. So these 
| > fixups were missed on merging.
| 
| no, the problem turned out to be that i kept those fixes too spread out, 
| and part of them went into the x86/for-akpm portion of the tree, part of 
| it went into x86/testing. Since all x86 developers work against 
| x86/testing this was never a problem - only now did it become one when i 
| shuffled patches and branch boundaries around. Such problems will go 
| away once linux-next starts using x86/testing as well. In any case i 
| moved your fixes together and fixed up the patch ordering as well.
| 
| 	Ingo
| 

ok, i see, thanks

		- Cyrill -

Re: linux-next: Tree for April 9

[Ingo Molnar]

* Cyrill Gorcunov <gorcunov@gmail.com> wrote:

> | > It seems that commit 883a9fc4e5d9b0701f15d4e5a23608f942104721 
> | > ("x86: cleanup - rename VM_MASK to X86_VM_MASK") from the x86 tree 
> | > seems to have missed some places.
> | 
> | i think what happened is that some changes came in from other trees 
> | that reintroduced the old symbols?
> 
> actually, that is the only explanation I could find. The last time I 
> sent you patches to fixup *all* VM_MASK (wich were grep'ed on *latest 
> branch over *all* sources inside x86). So this all were settled down 
> by a few of my patches and /for shame on me/ yours fixups. So these 
> fixups were missed on merging.

no, the problem turned out to be that i kept those fixes too spread out, 
and part of them went into the x86/for-akpm portion of the tree, part of 
it went into x86/testing. Since all x86 developers work against 
x86/testing this was never a problem - only now did it become one when i 
shuffled patches and branch boundaries around. Such problems will go 
away once linux-next starts using x86/testing as well. In any case i 
moved your fixes together and fixed up the patch ordering as well.

	Ingo

Re: linux-next: Tree for April 9

[Cyrill Gorcunov]

[Ingo Molnar - Wed, Apr 09, 2008 at 01:31:09PM +0200]
| 
| * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
| 
| > Hi Jacek,
| > 
| > On Wed, 9 Apr 2008 21:09:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
| > >
| > > Thanks for the report, can you please send us your .config, please?
| > 
| > Don't worry about it, I found the problem.
| > 
| > It seems that commit 883a9fc4e5d9b0701f15d4e5a23608f942104721 ("x86: 
| > cleanup - rename VM_MASK to X86_VM_MASK") from the x86 tree seems to 
| > have missed some places.
| 
| i think what happened is that some changes came in from other trees that 
| reintroduced the old symbols?

actually, that is the only explanation I could find. The last time I sent
you patches to fixup *all* VM_MASK (wich were grep'ed on *latest branch over
*all* sources inside x86). So this all were settled down by a few of my
patches and /for shame on me/ yours fixups. So these fixups were missed
on merging.

| 
| if that's the case i'll add back the old symbol names to make the 
| transition and integration easier.
| 
| 	Ingo
| 
		- Cyrill -

Re: linux-next: Tree for April 9

[Ingo Molnar]

* Ingo Molnar <mingo@elte.hu> wrote:

> > Yep, I did the same. You can find patch, which renames changes 
> > VM_MASK to X86_VM_MASK across all files in arch/x86/kernel, here: 
> > http://pin.if.uz.zgora.pl/~difrost/linux-next/09042008/
> 
> ah, that again comes from x86/for-akpm missing a patch that comes 
> later in x86/latest. I'll resort it.

done, i've pushed out that reordering into x86.git.

	Ingo

Re: linux-next: Tree for April 9

[Jacek Luczak]

Ingo Molnar pisze:
> * Jacek Luczak <difrost.kernel@gmail.com> wrote:
> 
>>> Don't worry about it, I found the problem.
>>>
>>> It seems that commit 883a9fc4e5d9b0701f15d4e5a23608f942104721 ("x86: 
>>> cleanup - rename VM_MASK to X86_VM_MASK") from the x86 tree seems to 
>>> have missed some places.
>> Yep, I did the same. You can find patch, which renames changes VM_MASK 
>> to X86_VM_MASK across all files in arch/x86/kernel, here: 
>> http://pin.if.uz.zgora.pl/~difrost/linux-next/09042008/
> 
> ah, that again comes from x86/for-akpm missing a patch that comes later 
> in x86/latest. I'll resort it.

X86_VM_MASK was already changed in one place in kernel/traps_32.c:
  arch/x86/kernel/traps_32.c:502:    if (regs->flags & X86_VM_MASK) {
and in mm/fault.c:
  if (regs->flags & (X86_EFLAGS_IF | X86_VM_MASK))

-Jacek

Re: linux-next: Tree for April 9

[Ingo Molnar]

* Jacek Luczak <difrost.kernel@gmail.com> wrote:

>> Don't worry about it, I found the problem.
>>
>> It seems that commit 883a9fc4e5d9b0701f15d4e5a23608f942104721 ("x86: 
>> cleanup - rename VM_MASK to X86_VM_MASK") from the x86 tree seems to 
>> have missed some places.
>
> Yep, I did the same. You can find patch, which renames changes VM_MASK 
> to X86_VM_MASK across all files in arch/x86/kernel, here: 
> http://pin.if.uz.zgora.pl/~difrost/linux-next/09042008/

ah, that again comes from x86/for-akpm missing a patch that comes later 
in x86/latest. I'll resort it.

	Ingo

Re: linux-next: Tree for April 9

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Jacek,
> 
> On Wed, 9 Apr 2008 21:09:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Thanks for the report, can you please send us your .config, please?
> 
> Don't worry about it, I found the problem.
> 
> It seems that commit 883a9fc4e5d9b0701f15d4e5a23608f942104721 ("x86: 
> cleanup - rename VM_MASK to X86_VM_MASK") from the x86 tree seems to 
> have missed some places.

i think what happened is that some changes came in from other trees that 
reintroduced the old symbols?

if that's the case i'll add back the old symbol names to make the 
transition and integration easier.

	Ingo

Re: linux-next: Tree for April 9

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

Hi Jacek,

On Wed, 9 Apr 2008 21:09:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Thanks for the report, can you please send us your .config, please?

Don't worry about it, I found the problem.

It seems that commit 883a9fc4e5d9b0701f15d4e5a23608f942104721 ("x86:
cleanup - rename VM_MASK to X86_VM_MASK") from the x86 tree seems to have
missed some places.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: linux-next: Tree for April 9

[Jacek Luczak]

Stephen Rothwell pisze:
> Hi Jacek,
> 
> On Wed, 9 Apr 2008 21:09:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Thanks for the report, can you please send us your .config, please?
> 
> Don't worry about it, I found the problem.
> 
> It seems that commit 883a9fc4e5d9b0701f15d4e5a23608f942104721 ("x86:
> cleanup - rename VM_MASK to X86_VM_MASK") from the x86 tree seems to have
> missed some places.
> 

Yep, I did the same. You can find patch, which renames changes VM_MASK 
to X86_VM_MASK across all files in arch/x86/kernel, here: 
http://pin.if.uz.zgora.pl/~difrost/linux-next/09042008/

-Jacek

Re: linux-next: Tree for April 9

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1554 bytes --]

Hi Jacek,

On Wed, 9 Apr 2008 13:00:37 +0200 "Jacek Luczak" <difrost.kernel@gmail.com> wrote:
>
> this tree fails to compile on my box with message:
>   CC      init/version.o
> arch/x86/kernel/traps_32.c: In function 'do_general_protection':
> arch/x86/kernel/traps_32.c:647: error: 'VM_MASK' undeclared (first use in
> this function)
> arch/x86/kernel/traps_32.c:647: error: (Each undeclared identifier is
> reported only once
> arch/x86/kernel/traps_32.c:647: error: for each function it appears in.)
> arch/x86/kernel/traps_32.c: In function 'do_debug':
> arch/x86/kernel/traps_32.c:926: error: 'VM_MASK' undeclared (first use in
> this function)
> arch/x86/kernel/traps_32.c: In function 'do_simd_coprocessor_error':
> arch/x86/kernel/traps_32.c:1098: error: 'VM_MASK' undeclared (first use in
> this function)
> 
> GCC version:
> $ gcc -v
> Reading specs from /usr/lib/gcc/i686-slackware-linux/4.2.2/specs
> Target: i686-slackware-linux
> Configured with: ../gcc-4.2.2/configure --prefix=/usr --enable-shared
> --enable-threads=posix --enable-__cxa_atexit --disable-checking
> --with-gnu-ld --enable-languages=c,c++ --enable-clocale=gnu --verbose
> --disable-multilib --with-tune=prescott --disable-libstdcxx-pch
> --disable-bootstrap --target=i686-slackware-linux
> --host=i686-slackware-linux
> Thread model: posix
> gcc version 4.2.2

Thanks for the report, can you please send us your .config, please?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

linux-next: Tree for April 9

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 5126 bytes --]

Hi all,

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(tar balls at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).

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.

There were a few merge conflicts (fairly trivial) and couple of build
failures (notified).  There is a know build failure with powerpc
allyesconfig.  Below is a summary of the state of the merge.

We are up to 55 trees, 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/ and the guys at http://test.kernel.org/.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Merging origin/master
Merging x86-fixes/for-linus
Merging sched-fixes/for-linus
Merging powerpc-merge/merge
Merging scsi-rc-fixes/master
Merging quilt/driver-core
Merging quilt/pci
Merging quilt/usb
Merging x86/for-akpm
Created commit 11876f8: Revert "x86: phase out forced inlining"
Merging sched/for-akpm
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/kernel-doc
Merging avr32/avr32-arch
Merging v4l-dvb/stable
Merging s390/features
Merging sh/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
CONFLICT (content): Merge conflict in Documentation/ide/ide.txt
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in drivers/ide/ide.c
CONFLICT (content): Merge conflict in include/asm-x86/ide.h
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging libata/NEXT
Applying libata-fix-1.patch
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
CONFLICT (content): Merge conflict in drivers/infiniband/hw/amso1100/c2_provider.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb3/iwch_provider.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_verbs.c
Applying infiniband-fix-2
Merging acpi/test
CONFLICT (content): Merge conflict in arch/x86/kernel/setup_64.c
CONFLICT (delete/modify): arch/x86/kernel/smpboot_64.c deleted in HEAD and modified in acpi/test. Version acpi/test of arch/x86/kernel/smpboot_64.c left in tree.
CONFLICT (delete/modify): include/asm-x86/smp_64.h deleted in HEAD and modified in acpi/test. Version acpi/test of include/asm-x86/smp_64.h left in tree.
$ git rm arch/x86/kernel/smpboot_64.c include/asm-x86/smp_64.h
Applying acpi-fix-1.patch
Applying acpi-fix-2.patch
Merging blackfin/for-linus
Merging nfsd/nfsd-next
Merging ieee1394/for-next
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging hwmon/testing
Merging ubi/master
Merging kvm/master
CONFLICT (add/add): Merge conflict in include/asm-s390/sysinfo.h
CONFLICT (content): Merge conflict in include/asm-x86/kvm_host.h
Merging dlm/next
Merging scsi/master
Merging ia64/test
CONFLICT (content): Merge conflict in arch/ia64/mm/tlb.c
Merging tests/master
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging ocfs2/linux-next
Merging selinux/for-akpm
Merging quilt/m68k
Merging powerpc/powerpc-next
Merging hrt/mm
Merging lblnet/master
Merging ext4/next
CONFLICT (content): Merge conflict in fs/jbd2/journal.c
CONFLICT (content): Merge conflict in fs/jbd2/revoke.c
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging security-testing/next
Merging net/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in MAINTAINERS
Merging galak/powerpc-next
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/vfs-2.6.25
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_ialloc.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_sb.h
Merging semaphore/semaphore
CONFLICT (delete/modify): include/asm-x86/semaphore_32.h deleted in semaphore/semaphore and modified in HEAD. Version HEAD of include/asm-x86/semaphore_32.h left in tree.
CONFLICT (delete/modify): include/asm-x86/semaphore_64.h deleted in semaphore/semaphore and modified in HEAD. Version HEAD of include/asm-x86/semaphore_64.h left in tree.
$ git rm include/asm-x86/semaphore_32.h include/asm-x86/semaphore_64.h
Merging quilt/ldp
Created commit 1d2b198: Revert "wusb: add the wireless usb stack to Linux"
Applying parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP
Applying nsc-ircc: wrap PNP probe code in #ifdef CONFIG_PNP
Applying smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]