linux-next: Tree for April 28

linux-next: Tree for April 28

[Stephen Rothwell]

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

Hi all,

Changes since 20100427:

Removed tree: staging (replaced by staging-next)

Dropped trees: tmio-mmc (long unresolved conflicts and unable to fetch)
	hwlat (at the maintainer's request)

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

The v4l-dvb tree still has its build failure, so I used the version from
next-20100409.

The kvm tree still has its build failure for which I applied a patch.

The net lost its build failure and a conflict.

The block tree gained conflicts against the v9fs and mtd trees and a
build failure so I used the version from next-20100427.

The drm tree gained a conflict against Linus' tree.

The viafb tree lost its build failure.

I applied a patch to the tip tree for a boot failure on powerpc.

The bk-ioctl tree lost its conflicts.

The tty tree still has its build failure for which I reverted 2 commits.

The staging-next tree gained conflicts against the pcmcia, v4l-dvb and
staging.current trees.

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

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 162 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
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 vfs/for-next
CONFLICT (content): Merge conflict in fs/cifs/file.c
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/input/input.c
Applying: v4l-dvb: update gfp/slab.h includes
$ git reset --hard HEAD^
Merging refs/next/20100409/v4l-dvb
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
Applying: kvm: powerpc: use of kzalloc/kfree requires including slab.h
Merging dlm/next
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in drivers/scsi/iscsi_tcp.c
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas_tf/cmd.c
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas_tf/main.c
Applying: wireless: update gfp/slab.h includes
Merging mtd/master
Applying: mtd: update gfp/slab.h includes
Merging crypto/master
CONFLICT (content): Merge conflict in drivers/crypto/mv_cesa.c
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
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
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
CONFLICT (content): Merge conflict in fs/9p/vfs_super.c
$ git reset --hard HEAD^
Merging refs/next/20100427/block
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/net/pcmcia/3c589_cs.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
CONFLICT (content): Merge conflict in drivers/md/raid5.c
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/dma/Makefile
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/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r300.c
Merging viafb/viafb-next
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
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 omap_dss2/for-next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Applying: lockdep: Fix redundant_hardirqs_on incremented with irqs enabled
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 bkl-core/bkl/core
Merging bkl-procfs/bkl/procfs
Merging bkl-ioctl/bkl/ioctl
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/platform.c
Merging quilt/tty
CONFLICT (content): Merge conflict in include/linux/tty.h
[master 5a43b35] Revert "serial: Add driver for the Altera UART"
[master bd1d7f2] Revert "serial: Add driver for the Altera JTAG UART"
Merging quilt/usb
Applying: usb: update gfp/slab.h includes
Merging staging-next/staging-next
CONFLICT (content): Merge conflict in drivers/staging/arlan/arlan-main.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/cb_das16_cs.c
CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-alsa.c
CONFLICT (content): Merge conflict in drivers/staging/dt3155/dt3155_drv.c
CONFLICT (content): Merge conflict in drivers/staging/netwave/netwave_cs.c
Merging slabh/slabh
Applying: staging: update gfp/slab.h includes
Merging scsi-post-merge/master

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

Re: linux-next: Tree for April 28 (logfs)

[Randy Dunlap]

When CONFIG_BLOCK is not enabled:

fs/logfs/super.c:142: error: implicit declaration of function 'bdev_get_queue'
fs/logfs/super.c:142: error: invalid type argument of '->' (have 'int')

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

[PATCH -next] infiniband: fix cxgb4 printk format warnings

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

Fix printk format warnings in infiniband/hw/cxgb4:

drivers/infiniband/hw/cxgb4/cq.c:844: warning: format '%lu' expects type 'long unsigned int', but argument 6 has type 'size_t'
drivers/infiniband/hw/cxgb4/qp.c:109: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'phys_addr_t'
drivers/infiniband/hw/cxgb4/qp.c:109: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type 'phys_addr_t'
drivers/infiniband/hw/cxgb4/qp.c:1407: warning: format '%lu' expects type 'long unsigned int', but argument 4 ha s type 'size_t'
drivers/infiniband/hw/cxgb4/qp.c:1407: warning: format '%lu' expects type 'long unsigned int', but argument 6 has type 'size_t'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
Wouldn't it be Good if virt_to_phys() returned the same typed value
on all arches?

Note: cxgb4 needs MAINTAINER info.

 drivers/infiniband/hw/cxgb4/cq.c |    2 +-
 drivers/infiniband/hw/cxgb4/qp.c |    8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

--- linux-next-20100428.orig/drivers/infiniband/hw/cxgb4/cq.c
+++ linux-next-20100428/drivers/infiniband/hw/cxgb4/cq.c
@@ -841,7 +841,7 @@ struct ib_cq *c4iw_create_cq(struct ib_d
 		mm2->len = PAGE_SIZE;
 		insert_mmap(ucontext, mm2);
 	}
-	PDBG("%s cqid 0x%0x chp %p size %u memsize %lu, dma_addr 0x%0llx\n",
+	PDBG("%s cqid 0x%0x chp %p size %u memsize %zu, dma_addr 0x%0llx\n",
 	     __func__, chp->cq.cqid, chp, chp->cq.size,
 	     chp->cq.memsize,
 	     (unsigned long long) chp->cq.dma_addr);
--- linux-next-20100428.orig/drivers/infiniband/hw/cxgb4/qp.c
+++ linux-next-20100428/drivers/infiniband/hw/cxgb4/qp.c
@@ -107,8 +107,10 @@ static int create_qp(struct c4iw_rdev *r
 	if (!wq->rq.queue)
 		goto err6;
 	PDBG("%s sq base va 0x%p pa 0x%llx rq base va 0x%p pa 0x%llx\n",
-		__func__, wq->sq.queue, virt_to_phys(wq->sq.queue),
-		wq->rq.queue, virt_to_phys(wq->rq.queue));
+		__func__, wq->sq.queue,
+		(unsigned long long)virt_to_phys(wq->sq.queue),
+		wq->rq.queue,
+		(unsigned long long)virt_to_phys(wq->rq.queue));
 	memset(wq->rq.queue, 0, wq->rq.memsize);
 	pci_unmap_addr_set(&wq->rq, mapping, wq->rq.dma_addr);
 
@@ -1404,7 +1406,7 @@ struct ib_qp *c4iw_create_qp(struct ib_p
 		qhp->wq.rq.memsize = roundup(qhp->wq.rq.memsize, PAGE_SIZE);
 	}
 
-	PDBG("%s sqsize %u sqmemsize %lu rqsize %u rqmemsize %lu\n",
+	PDBG("%s sqsize %u sqmemsize %zu rqsize %u rqmemsize %zu\n",
 	     __func__, sqsize, qhp->wq.sq.memsize, rqsize, qhp->wq.rq.memsize);
 
 	ret = create_qp(&rhp->rdev, &qhp->wq, &schp->cq, &rchp->cq,

Re: linux-next: Tree for April 28 (logfs)

[Randy Dunlap]

On Wed, 28 Apr 2010 08:56:04 -0700 Randy Dunlap wrote:

> 
> When CONFIG_BLOCK is not enabled:
> 
> fs/logfs/super.c:142: error: implicit declaration of function 'bdev_get_queue'
> fs/logfs/super.c:142: error: invalid type argument of '->' (have 'int')


Still have this build error in linux-next-May 5-2010.

[and L:      logfs@logfs.org
is moderated for non-subscribers]

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: [PATCH -next] infiniband: fix cxgb4 printk format warnings

[Roland Dreier]

Thanks, rolled this into the new cxgb4 driver.

 > Wouldn't it be Good if virt_to_phys() returned the same typed value
 > on all arches?

heh.

 > Note: cxgb4 needs MAINTAINER info.

I'll try to take care of it.

Thanks
-- 
Roland Dreier <rolandd@cisco.com> || For corporate legal information go to:
http://www.cisco.com/web/about/doing_business/legal/cri/index.html

Re: linux-next: Tree for April 28 (logfs)

[Jörn Engel]

On Wed, 5 May 2010 09:20:20 -0700, Randy Dunlap wrote:
> On Wed, 28 Apr 2010 08:56:04 -0700 Randy Dunlap wrote:
> 
> > When CONFIG_BLOCK is not enabled:
> > 
> > fs/logfs/super.c:142: error: implicit declaration of function 'bdev_get_queue'
> > fs/logfs/super.c:142: error: invalid type argument of '->' (have 'int')
> 
> Still have this build error in linux-next-May 5-2010.

Should be fixed now.  Sorry about the delay.

> [and L:      logfs@logfs.org
> is moderated for non-subscribers]

I have disabled the bounce mails.  Still moderated, but much less
annoying, I hope.

Jörn

-- 
Why do musicians compose symphonies and poets write poems?
They do it because life wouldn't have any meaning for them if they didn't.
That's why I draw cartoons.  It's my life.
-- Charles Shultz

_______________________________________________
Logfs mailing list
Logfs@logfs.org
http://logfs.org/cgi-bin/mailman/listinfo/logfs

Re: linux-next: Tree for April 28 (logfs)

[Ingo Molnar]

* J??rn Engel <joern@logfs.org> wrote:

> On Wed, 5 May 2010 09:20:20 -0700, Randy Dunlap wrote:
> > On Wed, 28 Apr 2010 08:56:04 -0700 Randy Dunlap wrote:
> > 
> > > When CONFIG_BLOCK is not enabled:
> > > 
> > > fs/logfs/super.c:142: error: implicit declaration of function 'bdev_get_queue'
> > > fs/logfs/super.c:142: error: invalid type argument of '->' (have 'int')
> > 
> > Still have this build error in linux-next-May 5-2010.
> 
> Should be fixed now.  Sorry about the delay.

Please post the fix itself as well, i've ran into this and so did others.

Thanks,

	Ingo

Re: linux-next -> 2.6.34: Tree for April 28 (logfs)

[Randy Dunlap]

On Sun, 9 May 2010 08:20:10 +0200 Ingo Molnar wrote:

> 
> * J??rn Engel <joern@logfs.org> wrote:
> 
> > On Wed, 5 May 2010 09:20:20 -0700, Randy Dunlap wrote:
> > > On Wed, 28 Apr 2010 08:56:04 -0700 Randy Dunlap wrote:
> > > 
> > > > When CONFIG_BLOCK is not enabled:
> > > > 
> > > > fs/logfs/super.c:142: error: implicit declaration of function 'bdev_get_queue'
> > > > fs/logfs/super.c:142: error: invalid type argument of '->' (have 'int')
> > > 
> > > Still have this build error in linux-next-May 5-2010.
> > 
> > Should be fixed now.  Sorry about the delay.
> 
> Please post the fix itself as well, i've ran into this and so did others.


This fix is now needed in 2.6.34....

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: linux-next: Tree for April 28 (logfs)

[Jörn Engel]

On Sun, 9 May 2010 08:20:10 +0200, Ingo Molnar wrote:
> 
> Please post the fix itself as well, i've ran into this and so did others.

Jörn

-- 
ticks = jiffies;
while (ticks == jiffies);
ticks = jiffies;
-- /usr/src/linux/init/main.c

When CONFIG_BLOCK is not enabled:

fs/logfs/super.c:142: error: implicit declaration of function 'bdev_get_queue'
fs/logfs/super.c:142: error: invalid type argument of '->' (have 'int')

Found by Randy Dunlap <randy.dunlap@oracle.com>

Signed-off-by: Joern Engel <joern@logfs.org>
---
 fs/logfs/super.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/fs/logfs/super.c b/fs/logfs/super.c
index edd9948..2b26938 100644
--- a/fs/logfs/super.c
+++ b/fs/logfs/super.c
@@ -138,10 +138,14 @@ static int logfs_sb_set(struct super_block *sb, void *_super)
 	sb->s_fs_info = super;
 	sb->s_mtd = super->s_mtd;
 	sb->s_bdev = super->s_bdev;
+#ifdef CONFIG_BLOCK
 	if (sb->s_bdev)
 		sb->s_bdi = &bdev_get_queue(sb->s_bdev)->backing_dev_info;
+#endif
+#ifdef CONFIG_MTD
 	if (sb->s_mtd)
 		sb->s_bdi = sb->s_mtd->backing_dev_info;
+#endif
 	return 0;
 }
 
-- 
1.6.6.1


_______________________________________________
Logfs mailing list
Logfs@logfs.org
http://logfs.org/cgi-bin/mailman/listinfo/logfs

Re: linux-next -> 2.6.34: Tree for April 28 (logfs)

[Jörn Engel]

On Sun, 16 May 2010 20:48:26 -0700, Randy Dunlap wrote:
> 
> This fix is now needed in 2.6.34....

I didn't send Linus a pull request, as I was on vacation last week.  Bad
timing, given the 2.6.34 release date. :(

Jörn

-- 
You cannot suppose that Moliere ever troubled himself to be original in the
matter of ideas. You cannot suppose that the stories he tells in his plays
have never been told before. They were culled, as you very well know.
-- Andre-Louis Moreau in Scarabouche

_______________________________________________
Logfs mailing list
Logfs@logfs.org
http://logfs.org/cgi-bin/mailman/listinfo/logfs

Re: linux-next -> 2.6.34: Tree for April 28 (logfs)

[Ingo Molnar]

* Jörn Engel <joern@logfs.org> wrote:

> On Sun, 16 May 2010 20:48:26 -0700, Randy Dunlap wrote:
> > 
> > This fix is now needed in 2.6.34....
> 
> I didn't send Linus a pull request, as I was on 
> vacation last week.  Bad timing, given the 2.6.34 
> release date. :(

Dont worry about it too much - the likehood of the 
build failure was very low, around 1:50 in my 
randconfig tests. I doubt any real user ran into this 
spontaenously - and randconfig folks know how to fix 
rare build failures :-)

You might still want to forward the commit to 
-stable, once it's in Linus's tree.

Thanks,

	Ingo