LinuxLists.cc - linux-next: Tree for March 19

2009-03-19 11:10:45

Subject: linux-next: Tree for March 19

Hi all,

Changes since 20090318:

The x86 tree lost a conflict.

The cpus4096 tree gained a conflict against the x86 tree and a build
problem for which I applied a fixup patch.

The tracing tree lost all its conflicts.

The net tree gained a build error due to a conflict with the tracing tree
for which I applied a merge fixup patch.

The rr tree gained a conflict against the cpus4096 tree.

The kmemcheck tree lost 3 conflicts, but gained another against the x86
tree.

The iommu tree gained conflicts against the kernel-doc, kmemcheck and x86
trees.

The osd tree lost its conflict.

The staging tree gained some conflicts against Linus' tree.

The scsi tree lost its build failure.

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

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 134 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 [email protected]

$ 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
CONFLICT (content): Merge conflict in arch/arm/mach-mx1/devices.c
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
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/elf.h
Merging xtensa/master
Merging tip-core/auto-core-next
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging cpus4096/auto-cpus4096-next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/common.c
Merging tracing/auto-tracing-next
Merging genirq/auto-genirq-next
CONFLICT (content): Merge conflict in kernel/irq/handle.c
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
CONFLICT (content): Merge conflict in lib/Makefile
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
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging v4l-dvb/master
Merging quota/for_next
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
CONFLICT (content): Merge conflict in drivers/ide/ide-dma.c
CONFLICT (content): Merge conflict in drivers/ide/ide-floppy.c
CONFLICT (content): Merge conflict in include/linux/ide.h
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
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging wireless/master
Applying: net: tracing interface fixup
Merging mtd/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/soc/pxa/pxa2xx-i2s.c
Merging cpufreq/next
CONFLICT (content): Merge conflict in arch/x86/include/asm/timer.h
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/powerpc/kernel/irq.c
CONFLICT (content): Merge conflict in arch/s390/include/asm/tlbflush.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/topology.h
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/powernow-k8.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
CONFLICT (content): Merge conflict in arch/x86/lguest/boot.c
CONFLICT (delete/modify): arch/x86/mach-default/setup.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/mach-default/setup.c left in tree.
CONFLICT (delete/modify): arch/x86/mach-voyager/setup.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/mach-voyager/setup.c left in tree.
CONFLICT (content): Merge conflict in drivers/firmware/dcdbas.c
CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134.h
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in kernel/module.c
$ git rm -f arch/x86/mach-default/setup.c
$ git rm -f arch/x86/mach-voyager/setup.c
Applying: rr: x86 irqaction merge fixup
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
CONFLICT (content): Merge conflict in fs/bio-integrity.c
CONFLICT (content): Merge conflict in fs/bio.c
CONFLICT (content): Merge conflict in include/linux/bio.h
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in firmware/Makefile
CONFLICT (content): Merge conflict in firmware/WHENCE
CONFLICT (content): Merge conflict in sound/isa/Kconfig
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in include/linux/slub_def.h
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_proc.c
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/kernel/head_32.S
CONFLICT (content): Merge conflict in kernel/trace/ring_buffer.c
CONFLICT (content): Merge conflict in mm/Makefile
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
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in lib/Makefile
Merging uwb/for-upstream
Merging watchdog/master
Merging proc/proc
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Applying: proc: remove a new user of proc_dir_entry::owner
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
CONFLICT (content): Merge conflict in drivers/scsi/iscsi_tcp.c
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 include/linux/percpu.h
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in kernel/module.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
CONFLICT (content): Merge conflict in mm/vmalloc.c
Merging suspend/linux-next
CONFLICT (content): Merge conflict in drivers/xen/manage.c
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/media/video/v4l2-device.c
CONFLICT (content): Merge conflict in drivers/net/wimax/i2400m/usb-notif.c
CONFLICT (content): Merge conflict in drivers/sh/maple/maple.c
Applying: acpi: update thermal for bus_id removal
Applying: net: update dnet.c for bus_id removal
Merging quilt/usb
Merging quilt/staging
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (delete/modify): drivers/staging/benet/be_int.c deleted in HEAD and modified in quilt/staging. Version quilt/staging of drivers/staging/benet/be_int.c left in tree.
$ git rm -f drivers/staging/benet/be_int.c
Merging scsi-post-merge/master
Applying powerpc/sparc: mmzone.h needs cpumask_t to be defined

Attachments:

(No filename) (10.67 kB)
(No filename) (197.00 B)
Download all attachments

2009-03-19 13:20:30

by Sachin Sant

[permalink] [raw]

Subject: Next March 19: drivers/comedi build break.

Next 19 randconfig build fails with :

CC [M] drivers/staging/comedi/comedi_fops.o
In file included from drivers/staging/comedi/comedidev.h:38,
from drivers/staging/comedi/comedi_fops.c:45:
drivers/staging/comedi/interrupt.h:25: error: conflicting types for ?irqreturn_t?
include/linux/irqreturn.h:14: error: previous declaration of ?irqreturn_t? was here
In file included from drivers/staging/comedi/comedidev.h:38,
from drivers/staging/comedi/comedi_fops.c:45:
drivers/staging/comedi/interrupt.h:28:1: warning: "IRQ_RETVAL" redefined
In file included from include/linux/interrupt.h:10,
from drivers/staging/comedi/interrupt.h:22,
from drivers/staging/comedi/comedidev.h:38,
from drivers/staging/comedi/comedi_fops.c:45:
include/linux/irqreturn.h:15:1: warning: this is the location of the previous definition
make[3]: *** [drivers/staging/comedi/comedi_fops.o] Error 1

Probably because of the irqreturn_t related changes.

Thanks
-Sachin

--

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

2009-03-19 15:33:47

by Greg KH

[permalink] [raw]

Subject: Re: Next March 19: drivers/comedi build break.

On Thu, Mar 19, 2009 at 06:50:10PM +0530, Sachin Sant wrote:
> Next 19 randconfig build fails with :
>
> CC [M] drivers/staging/comedi/comedi_fops.o
> In file included from drivers/staging/comedi/comedidev.h:38,
> from drivers/staging/comedi/comedi_fops.c:45:
> drivers/staging/comedi/interrupt.h:25: error: conflicting types for
> ‘irqreturn_t’
> include/linux/irqreturn.h:14: error: previous declaration of
> ‘irqreturn_t’ was here
> In file included from drivers/staging/comedi/comedidev.h:38,
> from drivers/staging/comedi/comedi_fops.c:45:
> drivers/staging/comedi/interrupt.h:28:1: warning: "IRQ_RETVAL" redefined
> In file included from include/linux/interrupt.h:10,
> from drivers/staging/comedi/interrupt.h:22,
> from drivers/staging/comedi/comedidev.h:38,
> from drivers/staging/comedi/comedi_fops.c:45:
> include/linux/irqreturn.h:15:1: warning: this is the location of the
> previous definition
> make[3]: *** [drivers/staging/comedi/comedi_fops.o] Error 1
>
> Probably because of the irqreturn_t related changes.

Ah, I wasn't aware of them, I'll go dig and fix this up...

thanks,

greg k-h

2009-03-19 16:52:52

by Randy Dunlap

On Sat, Mar 21, 2009 at 01:22:01PM +0100, Christian Lamparter wrote:
> On Saturday 21 March 2009 07:36:33 Kalle Valo wrote:
> > Christian Lamparter <[email protected]> writes:
> >
> > > This patch fixes a compile problem when the MAC80211_LEDS
> > > triggers are enabled but not LED class itself.
> > > (which is sort of pointless, but anyway...)
> >
> > [...]
> >
> > > @@ -17,31 +18,6 @@ config P54_USB
> > > select CRC32
> > > ---help---
> > > This driver is for USB isl38xx based wireless cards.
> > > - These are USB based adapters found in devices such as:
> > > -
> > > - 3COM 3CRWE254G72
> > > - SMC 2862W-G
> > > - Accton 802.11g WN4501 USB
> > > - Siemens Gigaset USB
> > > - Netgear WG121
> > > - Netgear WG111
> > > - Medion 40900, Roper Europe
> > > - Shuttle PN15, Airvast WM168g, IOGear GWU513
> > > - Linksys WUSB54G
> > > - Linksys WUSB54G Portable
> > > - DLink DWL-G120 Spinnaker
> > > - DLink DWL-G122
> > > - Belkin F5D7050 ver 1000
> > > - Cohiba Proto board
> > > - SMC 2862W-G version 2
> > > - U.S. Robotics U5 802.11g Adapter
> > > - FUJITSU E-5400 USB D1700
> > > - Sagem XG703A
> > > - DLink DWL-G120 Cohiba
> > > - Spinnaker Proto board
> > > - Linksys WUSB54AG
> > > - Inventel UR054G
> > > - Spinnaker DUT
> >
> > This change wasn't mentioned in the commit log. Did this get included
> > by accident?
> >
> heh true... should I add them back? after all this list hasn't changed in years
> and we have a much nicer one on http://www.prism54.org/
> ( http://wireless.kernel.org/en/users/Drivers/p54/devices )

Getting rid of them is fine, but it should probably be done in a different patch.

John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2009-03-23 14:38:01

by Christian Lamparter

[permalink] [raw]

Subject: [PATCH v2] p54: fix SoftLED compile dependencies

This patch fixes a compile problem when the MAC80211_LEDS
triggers are enabled but not LED class itself.
(which is sort of pointless, but anyway...)

Signed-off-by: Christian Lamparter <[email protected]>
---
> > heh true... should I add them back? after all this list hasn't changed in years
> > and we have a much nicer one on http://www.prism54.org/
> > ( http://wireless.kernel.org/en/users/Drivers/p54/devices )
>
> Getting rid of them is fine, but it should probably be done in a different patch.
heh, "451 4.5.0 From MTA([127.0.0.1]:10025) during fwd-connect"...

I guess no one got my last reply, right?
---
diff --git a/drivers/net/wireless/p54/Kconfig b/drivers/net/wireless/p54/Kconfig
index 0e344ac..ee1aaca 100644
--- a/drivers/net/wireless/p54/Kconfig
+++ b/drivers/net/wireless/p54/Kconfig
@@ -71,3 +71,8 @@ config P54_SPI
Nokia's N800/N810 Portable Internet Tablet.

If you choose to build a module, it'll be called p54spi.
+
+config P54_LEDS
+ bool
+ depends on P54_COMMON && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = P54_COMMON)
+ default y
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index 0a98983..0c1b057 100644
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -21,9 +21,9 @@
#include <linux/etherdevice.h>

#include <net/mac80211.h>
-#ifdef CONFIG_MAC80211_LEDS
+#ifdef CONFIG_P54_LEDS
#include <linux/leds.h>
-#endif /* CONFIG_MAC80211_LEDS */
+#endif /* CONFIG_P54_LEDS */

#include "p54.h"
#include "p54common.h"
@@ -2420,7 +2420,7 @@ static int p54_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd,
return 0;
}

-#ifdef CONFIG_MAC80211_LEDS
+#ifdef CONFIG_P54_LEDS
static void p54_led_brightness_set(struct led_classdev *led_dev,
enum led_brightness brightness)
{
@@ -2508,7 +2508,7 @@ static void p54_unregister_leds(struct ieee80211_hw *dev)
if (priv->assoc_led.registered)
led_classdev_unregister(&priv->assoc_led.led_dev);
}
-#endif /* CONFIG_MAC80211_LEDS */
+#endif /* CONFIG_P54_LEDS */

static const struct ieee80211_ops p54_ops = {
.tx = p54_tx,
@@ -2592,11 +2592,11 @@ int p54_register_common(struct ieee80211_hw *dev, struct device *pdev)
return err;
}

- #ifdef CONFIG_MAC80211_LEDS
+#ifdef CONFIG_P54_LEDS
err = p54_init_leds(dev);
if (err)
return err;
- #endif /* CONFIG_MAC80211_LEDS */
+#endif /* CONFIG_P54_LEDS */

dev_info(pdev, "is registered as '%s'\n", wiphy_name(dev->wiphy));
return 0;
@@ -2610,9 +2610,9 @@ void p54_free_common(struct ieee80211_hw *dev)
kfree(priv->output_limit);
kfree(priv->curve_data);

- #ifdef CONFIG_MAC80211_LEDS
+#ifdef CONFIG_P54_LEDS
p54_unregister_leds(dev);
- #endif /* CONFIG_MAC80211_LEDS */
+#endif /* CONFIG_P54_LEDS */
}
EXPORT_SYMBOL_GPL(p54_free_common);