* Re: linux-next: sound tree build warning
From: Mark Brown @ 2009-08-10 18:43 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, linux-kernel, Stephen Rothwell
In-Reply-To: <s5hws5cm89y.wl%tiwai@suse.de>
On Mon, Aug 10, 2009 at 09:34:49AM +0200, Takashi Iwai wrote:
> Looks like a forgotten piece since the reg-cache branch merge.
> Mark, could you clean up?
The changes I pushed earlier today did so.
^ permalink raw reply
* [PATCH -next] dvb: siano uses/depends on INPUT
From: Randy Dunlap @ 2009-08-10 23:04 UTC (permalink / raw)
To: Stephen Rothwell, linux-media, akpm
Cc: linux-next, LKML, Michael Krufky, Uri Shkolnik
In-Reply-To: <20090810203508.f3258129.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
siano uses input_*() functions so it should depend on INPUT
to prevent build errors:
ERROR: "input_event" [drivers/media/dvb/siano/sms1xxx.ko] undefined!
ERROR: "input_register_device" [drivers/media/dvb/siano/sms1xxx.ko] undefined!
ERROR: "input_free_device" [drivers/media/dvb/siano/sms1xxx.ko] undefined!
ERROR: "input_unregister_device" [drivers/media/dvb/siano/sms1xxx.ko] undefined!
ERROR: "input_allocate_device" [drivers/media/dvb/siano/sms1xxx.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Michael Krufky <mkrufky@linuxtv.org>
Cc: Uri Shkolnik <uris@siano-ms.com>
---
drivers/media/dvb/siano/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20090810.orig/drivers/media/dvb/siano/Kconfig
+++ linux-next-20090810/drivers/media/dvb/siano/Kconfig
@@ -4,7 +4,7 @@
config DVB_SIANO_SMS1XXX
tristate "Siano SMS1XXX USB dongle support"
- depends on DVB_CORE && USB
+ depends on DVB_CORE && USB && INPUT
---help---
Choose Y here if you have a USB dongle with a SMS1XXX chipset.
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
^ permalink raw reply
* [PATCH -next] soc: fix I2C build errors
From: Randy Dunlap @ 2009-08-10 23:04 UTC (permalink / raw)
To: Stephen Rothwell, Timur Tabi; +Cc: linux-next, LKML, akpm
In-Reply-To: <20090810203508.f3258129.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix soc build errors when I2C is built as a loadable module:
(.text+0x5d26b): undefined reference to `i2c_master_send'
soc-cache.c:(.text+0x5d32d): undefined reference to `i2c_transfer'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Timur Tabi <timur@freescale.com>
---
sound/soc/soc-cache.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20090810.orig/sound/soc/soc-cache.c
+++ linux-next-20090810/sound/soc/soc-cache.c
@@ -108,7 +108,7 @@ static unsigned int snd_soc_8_16_read(st
return cache[reg];
}
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
static unsigned int snd_soc_8_16_read_i2c(struct snd_soc_codec *codec,
unsigned int r)
{
@@ -200,7 +200,7 @@ int snd_soc_codec_set_cache_io(struct sn
break;
case SND_SOC_I2C:
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
codec->hw_write = (hw_write_t)i2c_master_send;
#endif
if (io_types[i].i2c_read)
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
^ permalink raw reply
* Re: linux-next: staging series import warning
From: Greg KH @ 2009-08-10 22:08 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Anthony Wong
In-Reply-To: <20090810102443.3bc514b9.sfr@canb.auug.org.au>
On Mon, Aug 10, 2009 at 10:24:43AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> The import of the staging series produces these warnings (among others):
>
> staging-add-realtek-8192-pci-wireless-driver.patch
> quilt-tmp/.git/rebase-apply/patch:94: trailing whitespace.
> #ifndef __INC_DOT11D_H
> quilt-tmp/.git/rebase-apply/patch:95: trailing whitespace.
> #define __INC_DOT11D_H
> quilt-tmp/.git/rebase-apply/patch:96: trailing whitespace.
>
> quilt-tmp/.git/rebase-apply/patch:97: trailing whitespace.
> #ifdef ENABLE_DOT11D
> quilt-tmp/.git/rebase-apply/patch:98: trailing whitespace.
> #include "ieee80211.h"
> warning: squelched 21645 whitespace errors
> warning: 21650 lines add whitespace errors.
>
> This might be a good place for someone to consider starting cleaning
> up ... :-)
Ah crap, I got the wrong line-ends for some of those files, sorry about
that, I'll go clean it up...
greg k-h
^ permalink raw reply
* Re: linux-next: security-testing tree build failure
From: Stephen Rothwell @ 2009-08-10 23:58 UTC (permalink / raw)
To: Eric Paris; +Cc: James Morris, linux-next, linux-kernel
In-Reply-To: <1249913269.2081.1.camel@dhcp231-106.rdu.redhat.com>
[-- Attachment #1: Type: text/plain, Size: 444 bytes --]
HI Eric,
On Mon, 10 Aug 2009 10:07:49 -0400 Eric Paris <eparis@redhat.com> wrote:
>
> Sorry, I thought I put the definitions outside of the ifdef in
> security.h but clearly they aren't. Looks like James's tree has the fix
> as of a couple of hours ago, so you should be fix on your next pull from
> him.
Great, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: [PATCH] Fix compiler warnings and remove debug messages
From: Greg KH @ 2009-08-11 0:01 UTC (permalink / raw)
To: Lothar Wassmann
Cc: Stephen Rothwell, linux-next, linux-kernel, Michael Hennerich,
Bryan Wu, Mike Frysinger, Lothar Wassmann
In-Reply-To: <1249921736508-git-send-email-LW@KARO-electronics.de>
On Mon, Aug 10, 2009 at 06:28:56PM +0200, Lothar Wassmann wrote:
> This patch fixes the reported compiler warnings and removes excessive debug messages.
> Compile tested only!
I'd prefer the correct fixes for this driver. Mike, any thoughts on
some fixes for this?
thanks,
greg k-h
^ permalink raw reply
* Re: linux-next: usb tree build warnings
From: Greg KH @ 2009-08-11 0:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Lothar Wassmann, Michael Hennerich,
Bryan Wu, Mike Frysinger
In-Reply-To: <20090810193653.f228cf06.sfr@canb.auug.org.au>
On Mon, Aug 10, 2009 at 07:36:53PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next build (x86_64 allmodconfig) produced these warnings:
>
> In file included from drivers/usb/host/isp1362-hcd.c:100:
> drivers/usb/host/isp1362.h: In function 'ALIGNSTAT':
> drivers/usb/host/isp1362.h:583: warning: cast from pointer to integer of different size
> drivers/usb/host/isp1362.h: In function 'isp1362_write_fifo':
> drivers/usb/host/isp1362.h:773: warning: cast from pointer to integer of different size
> drivers/usb/host/isp1362.h: In function 'isp1362_read_buffer':
> drivers/usb/host/isp1362.h:965: warning: cast from pointer to integer of different size
> drivers/usb/host/isp1362.h: In function 'isp1362_write_buffer':
> drivers/usb/host/isp1362.h:985: warning: cast from pointer to integer of different size
> drivers/usb/host/isp1362-hcd.c: In function 'isp1362_irq':
> drivers/usb/host/isp1362-hcd.c:1079: warning: suggest parentheses around operand of '!' or change '&' to '&&' or '!' to '~'
> drivers/usb/host/isp1362-hcd.c:1091: warning: suggest parentheses around operand of '!' or change '&' to '&&' or '!' to '~'
> drivers/usb/host/isp1362-hcd.c: In function 'isp1362_mem_config':
> drivers/usb/host/isp1362-hcd.c:2283: warning: format '%3u' expects type 'unsigned int', but argument 5 has type 'long unsigned int'
> drivers/usb/host/isp1362-hcd.c:2286: warning: format '%3u' expects type 'unsigned int', but argument 5 has type 'long unsigned int'
> drivers/usb/host/isp1362-hcd.c: In function 'isp1362_remove':
> drivers/usb/host/isp1362-hcd.c:2676: warning: cast from pointer to integer of different size
> drivers/usb/host/isp1362-hcd.c:2680: warning: cast from pointer to integer of different size
> drivers/usb/host/isp1362-hcd.c: In function 'isp1362_probe':
> drivers/usb/host/isp1362-hcd.c:2809: warning: cast from pointer to integer of different size
> drivers/usb/host/isp1362-hcd.c:2812: warning: cast from pointer to integer of different size
> drivers/usb/host/isp1362-hcd.c:2818: warning: cast from pointer to integer of different size
>
> Introduced by commit 994857f5ead1a4f1d9152c5bbd6e63c2ec2d2b55 ("USB: NXP
> ISP1362 USB host driver").
Ick, thanks, I'll look into this.
greg k-h
^ permalink raw reply
* linux-next: nfsd tree build warning
From: Stephen Rothwell @ 2009-08-11 1:07 UTC (permalink / raw)
To: J. Bruce Fields; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
Hi Bruce,
Today's linux-next build (powerpc ppc64_defconfig) produced this warning:
net/sunrpc/svc_xprt.c: In function 'svc_pool_stats_show':
net/sunrpc/svc_xprt.c:1211: warning: too few arguments for format
Caused by commit ffcef87a1f31094709da615454b5911f3711bc65 ("Revert
"knfsd: avoid overloading the CPU scheduler with enormous load
averages"").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: staging series import warning
From: Stephen Rothwell @ 2009-08-11 1:12 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Anthony Wong
In-Reply-To: <20090810220856.GA27402@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
Hi Greg,
On Mon, 10 Aug 2009 15:08:56 -0700 Greg KH <greg@kroah.com> wrote:
>
> Ah crap, I got the wrong line-ends for some of those files, sorry about
> that, I'll go clean it up...
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: sound tree build warning
From: Stephen Rothwell @ 2009-08-11 3:22 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, linux-kernel, Clemens Ladisch
[-- Attachment #1: Type: text/plain, Size: 479 bytes --]
Hi Takashi,
Today's linux-next build (x86_64 allmodconfig) produced this warning:
sound/usb/usbaudio.c: In function 'init_substream_urbs':
sound/usb/usbaudio.c:1087: warning: comparison of distinct pointer types lacks a cast
Introduced by commit 765e8db078e63fdc076fcf6024c15d3b7b955746 ("sound:
usb-audio: do not make URBs longer than sync packet interval").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: sound tree build warning
From: Stephen Rothwell @ 2009-08-11 6:21 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, linux-kernel, Clemens Ladisch
In-Reply-To: <s5hzla6an7k.wl%tiwai@suse.de>
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
Hi Takashi,
On Tue, 11 Aug 2009 08:17:35 +0200 Takashi Iwai <tiwai@suse.de> wrote:
>
> Thanks, fixed now on sound git tree with the patch below.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: [PATCH] Fix compiler warnings and remove debug messages
From: Mike Frysinger @ 2009-08-11 7:59 UTC (permalink / raw)
To: Greg KH
Cc: Lothar Wassmann, Stephen Rothwell, linux-next, linux-kernel,
Michael Hennerich, Bryan Wu, Lothar Wassmann
In-Reply-To: <20090811000112.GB13314@kroah.com>
On Mon, Aug 10, 2009 at 20:01, Greg KH wrote:
> On Mon, Aug 10, 2009 at 06:28:56PM +0200, Lothar Wassmann wrote:
>> This patch fixes the reported compiler warnings and removes excessive debug messages.
>> Compile tested only!
>
> I'd prefer the correct fixes for this driver. Mike, any thoughts on
> some fixes for this?
if it's simply fixing printf modifiers, then i can send out a patch for that.
the changelog simply states "the reported compiler warnings" ... what
exactly must i do to reproduce these ?
-mike
^ permalink raw reply
* Re: [PATCH] Fix compiler warnings and remove debug messages
From: Stephen Rothwell @ 2009-08-11 8:31 UTC (permalink / raw)
To: Mike Frysinger
Cc: Greg KH, Lothar Wassmann, linux-next, linux-kernel,
Michael Hennerich, Bryan Wu
In-Reply-To: <8bd0f97a0908110059y344071adn3656eaea3d7edddf@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 961 bytes --]
Hi Mike,
On Tue, 11 Aug 2009 03:59:43 -0400 Mike Frysinger <vapier.adi@gmail.com> wrote:
>
> On Mon, Aug 10, 2009 at 20:01, Greg KH wrote:
> > On Mon, Aug 10, 2009 at 06:28:56PM +0200, Lothar Wassmann wrote:
> >> This patch fixes the reported compiler warnings and removes excessive debug messages.
> >> Compile tested only!
> >
> > I'd prefer the correct fixes for this driver. Mike, any thoughts on
> > some fixes for this?
>
> if it's simply fixing printf modifiers, then i can send out a patch for that.
>
> the changelog simply states "the reported compiler warnings" ... what
> exactly must i do to reproduce these ?
The original report was from an x86_64 allmodconfig build using gcc
v4.4.0. You should only need to attempt to build
drivers/usb/host/isp1362-hcd.c to see the warnings. It needs to be a 64
bit build.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: Tree for August 11
From: Stephen Rothwell @ 2009-08-11 8:34 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8449 bytes --]
Hi all,
Changes since 20090810:
This tree fails to build for powerpc allyesconfig (due to a TOC overflow
problem in the final link).
The nfsd tree lost its conflict.
The kvm tree lost its conflicts.
The rr tree lost its build failure.
The security-testing tree lost its build failure.
The staging tree lost a conflict.
----------------------------------------------------------------------------
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 140 trees (counting Linus' and 21 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
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/tty.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 ide-curent/master
Merging dwmw2/master
Merging arm/devel
CONFLICT (content): Merge conflict in MAINTAINERS
Merging davinci/for-next
Merging pxa/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging thumb-2/thumb-2
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
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
CONFLICT (content): Merge conflict in fs/configfs/dir.c
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/board-dm646x-evm.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm644x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm646x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm355.h
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm644x.h
Merging quota/for_next
Merging kbuild/master
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in arch/microblaze/include/asm/socket.h
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sdvo.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 omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Applying: drbd: fix for removal of blk_queue_stack_limits
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/include/asm/socket.h
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in kernel/fork.c
Merging oprofile/for-next
CONFLICT (content): Merge conflict in kernel/trace/ring_buffer.c
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
CONFLICT (content): Merge conflict in include/linux/topology.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/class.c
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/tty
CONFLICT (content): Merge conflict in arch/x86/include/asm/termios.h
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/gadget/m66592-udc.c
CONFLICT (content): Merge conflict in drivers/usb/host/r8a66597-hcd.c
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/epl/VirtualEthernetLinux.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/epl/VirtualEthernetLinux.c left in tree.
$ git rm -f drivers/staging/epl/VirtualEthernetLinux.c
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* [PATCH] wl1271: fix compiler warnings on 64 bit archs
From: Luciano Coelho @ 2009-08-11 8:58 UTC (permalink / raw)
To: linux-wireless-u79uwXL29TY76Z2rM5mHXA
Cc: linville-2XuSBdqkA4R54TAoqtyWWQ,
linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, sfr-3FnU+UHB4dNDw9hX6IcOSA
There were a few warnings when compiling the wl1271 driver on 64 bit
architectures. This was due to size mismatch of integers.
This commit fixes the following warnings:
drivers/net/wireless/wl12xx/wl1271_main.c: In function 'wl1271_irq_work':
drivers/net/wireless/wl12xx/wl1271_main.c:184: warning: large integer implicitly truncated to unsigned type
drivers/net/wireless/wl12xx/wl1271_boot.c: In function 'wl1271_boot_upload_firmware_chunk':
drivers/net/wireless/wl12xx/wl1271_boot.c:103: warning: format '%d' expects type 'int', but argument 2 has type 'size_t'
drivers/net/wireless/wl12xx/wl1271_boot.c:150: warning: format '%d' expects type 'int', but argument 2 has type 'size_t'
drivers/net/wireless/wl12xx/wl1271_boot.c: In function 'wl1271_boot_enable_interrupts':
drivers/net/wireless/wl12xx/wl1271_boot.c:278: warning: large integer implicitly truncated to unsigned type
Reported-by: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Signed-off-by: Luciano Coelho <luciano.coelho-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
---
drivers/net/wireless/wl12xx/wl1271_boot.c | 9 +++++----
drivers/net/wireless/wl12xx/wl1271_main.c | 3 ++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271_boot.c b/drivers/net/wireless/wl12xx/wl1271_boot.c
index 4c22f25..2b5d101 100644
--- a/drivers/net/wireless/wl12xx/wl1271_boot.c
+++ b/drivers/net/wireless/wl12xx/wl1271_boot.c
@@ -100,8 +100,8 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
wl1271_debug(DEBUG_BOOT, "starting firmware upload");
- wl1271_debug(DEBUG_BOOT, "fw_data_len %d chunk_size %d", fw_data_len,
- CHUNK_SIZE);
+ wl1271_debug(DEBUG_BOOT, "fw_data_len %d chunk_size %d",
+ (u32) fw_data_len, CHUNK_SIZE);
if ((fw_data_len % 4) != 0) {
@@ -148,7 +148,7 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
addr = dest + chunk_num * CHUNK_SIZE;
p = buf + chunk_num * CHUNK_SIZE;
wl1271_debug(DEBUG_BOOT, "uploading fw last chunk (%d B) 0x%p to 0x%x",
- fw_data_len % CHUNK_SIZE, p, addr);
+ (u32) fw_data_len % CHUNK_SIZE, p, addr);
wl1271_spi_mem_write(wl, addr, p, fw_data_len % CHUNK_SIZE);
return 0;
@@ -275,7 +275,8 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)
static void wl1271_boot_enable_interrupts(struct wl1271 *wl)
{
enable_irq(wl->irq);
- wl1271_reg_write32(wl, ACX_REG_INTERRUPT_MASK, ~(WL1271_INTR_MASK));
+ wl1271_reg_write32(wl, ACX_REG_INTERRUPT_MASK,
+ WL1271_ACX_INTR_ALL & ~(WL1271_INTR_MASK));
wl1271_reg_write32(wl, HI_CFG, HI_CFG_DEF_VAL);
}
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 3bb45ce..4102d59 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -181,7 +181,8 @@ static void wl1271_irq_work(struct work_struct *work)
} while (intr && --ctr);
out_sleep:
- wl1271_reg_write32(wl, ACX_REG_INTERRUPT_MASK, ~(WL1271_INTR_MASK));
+ wl1271_reg_write32(wl, ACX_REG_INTERRUPT_MASK,
+ WL1271_ACX_INTR_ALL & ~(WL1271_INTR_MASK));
wl1271_ps_elp_sleep(wl);
out:
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related
* [PATCH] Fix Warnings from net/netlink/genetlink.c
From: vibi sreenivasan @ 2009-08-11 10:07 UTC (permalink / raw)
To: netdev; +Cc: Johannes Berg, Thomas Graf, linux-next
net/netlink/genetlink.c: In function `genl_register_mc_group':
net/netlink/genetlink.c:139: warning: 'err' might be used uninitialized in this function
Signed-off-by: vibi sreenivasan <vibi_sreenivasan@cms.com>
---
net/netlink/genetlink.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 575c643..66f6ba0 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -136,7 +136,7 @@ int genl_register_mc_group(struct genl_family *family,
{
int id;
unsigned long *new_groups;
- int err;
+ int err = 0;
BUG_ON(grp->name[0] == '\0');
--
1.6.3.3
^ permalink raw reply related
* Re: [PATCH -next] soc: fix I2C build errors
From: Mark Brown @ 2009-08-11 9:56 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, Timur Tabi, linux-next, LKML, akpm
In-Reply-To: <20090810160439.72e417de.randy.dunlap@oracle.com>
On Mon, Aug 10, 2009 at 04:04:39PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> Fix soc build errors when I2C is built as a loadable module:
> (.text+0x5d26b): undefined reference to `i2c_master_send'
> soc-cache.c:(.text+0x5d32d): undefined reference to `i2c_transfer'
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Timur Tabi <timur@freescale.com>
I've applied this.
It'd be helpful if in future you could try to CC the relevant
maintainers on patches. Here you've CCed Timur (who had nothing to do
with any of this code) but none of the ASoC or ALSA maintainers.
^ permalink raw reply
* Re: [PATCH] Fix Warnings from net/netlink/genetlink.c
From: vibi sreenivasan @ 2009-08-11 9:15 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-next, Thomas Graf, netdev
In-Reply-To: <1249976174.5903.16.camel@johannes.local>
Hi Johannes,
On Tue, 2009-08-11 at 09:36 +0200, Johannes Berg wrote:
> On Tue, 2009-08-11 at 12:57 +0530, vibi sreenivasan wrote:
> > Fix following compiler warnings
> >
> > net/netlink/genetlink.c: In function `genl_register_mc_group':
> > net/netlink/genetlink.c:139: warning: 'err' might be used uninitialized in this function
>
> Well, only if there's no netns which can't happen.
So how to silence that warning?
>
> However, technical problems prohibit your patch from being applied.
>
> a) you sent it to the wrong list, copying netdev
>
Sorry i will send it to netdev
> > Signed-off-by: vibi sreenivasan, CMS COMPUTERS LTD, INDIA <vibi_sreenivasan@cms.com>
>
> b) this isn't correctly formatted, have you actually read
> Documentation/SubmittingPatches including the legal text that you're
> agreeing to (section 12 of that document)?
>
Sorry again i will remove the tags at the end & resubmit it again.
Thanks for pointing out the issues.
Thanks & Regards
vibi sreenivasan
> johannes
>
> > net/netlink/genetlink.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
> > index 575c643..66f6ba0 100644
> > --- a/net/netlink/genetlink.c
> > +++ b/net/netlink/genetlink.c
> > @@ -136,7 +136,7 @@ int genl_register_mc_group(struct genl_family *family,
> > {
> > int id;
> > unsigned long *new_groups;
> > - int err;
> > + int err = 0;
> >
> > BUG_ON(grp->name[0] == '\0');
> >
>
^ permalink raw reply
* Re: [PATCH] wl1271: fix compiler warnings on 64 bit archs
From: Stephen Rothwell @ 2009-08-11 10:07 UTC (permalink / raw)
To: Luciano Coelho; +Cc: linux-wireless, linville, linux-next, linux-kernel
In-Reply-To: <1249981107-21746-1-git-send-email-luciano.coelho@nokia.com>
[-- Attachment #1: Type: text/plain, Size: 1060 bytes --]
Hi Luciano,
On Tue, 11 Aug 2009 11:58:27 +0300 Luciano Coelho <luciano.coelho@nokia.com> wrote:
>
> +++ b/drivers/net/wireless/wl12xx/wl1271_boot.c
> @@ -100,8 +100,8 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
>
> wl1271_debug(DEBUG_BOOT, "starting firmware upload");
>
> - wl1271_debug(DEBUG_BOOT, "fw_data_len %d chunk_size %d", fw_data_len,
> - CHUNK_SIZE);
> + wl1271_debug(DEBUG_BOOT, "fw_data_len %d chunk_size %d",
> + (u32) fw_data_len, CHUNK_SIZE);
fw_data_len is a size_t and so should be printed with %zd.
> @@ -148,7 +148,7 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
> addr = dest + chunk_num * CHUNK_SIZE;
> p = buf + chunk_num * CHUNK_SIZE;
> wl1271_debug(DEBUG_BOOT, "uploading fw last chunk (%d B) 0x%p to 0x%x",
> - fw_data_len % CHUNK_SIZE, p, addr);
> + (u32) fw_data_len % CHUNK_SIZE, p, addr);
ditto.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: sound tree build warning
From: Takashi Iwai @ 2009-08-11 6:17 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Clemens Ladisch
In-Reply-To: <20090811132258.8e899735.sfr@canb.auug.org.au>
At Tue, 11 Aug 2009 13:22:58 +1000,
Stephen Rothwell wrote:
>
> Hi Takashi,
>
> Today's linux-next build (x86_64 allmodconfig) produced this warning:
>
> sound/usb/usbaudio.c: In function 'init_substream_urbs':
> sound/usb/usbaudio.c:1087: warning: comparison of distinct pointer types lacks a cast
>
> Introduced by commit 765e8db078e63fdc076fcf6024c15d3b7b955746 ("sound:
> usb-audio: do not make URBs longer than sync packet interval").
Thanks, fixed now on sound git tree with the patch below.
Takashi
---
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index fa3f7a1..5149c58 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -1084,7 +1084,7 @@ static int init_substream_urbs(struct snd_usb_substream *subs, unsigned int peri
urb_packs = 1;
urb_packs *= packs_per_ms;
if (subs->syncpipe)
- urb_packs = min(urb_packs, 1 << subs->syncinterval);
+ urb_packs = min(urb_packs, 1U << subs->syncinterval);
/* decide how many packets to be used */
if (is_playback) {
^ permalink raw reply related
* Re: [PATCH] Fix Warnings from net/netlink/genetlink.c
From: Johannes Berg @ 2009-08-11 9:11 UTC (permalink / raw)
To: vibi_sreenivasan; +Cc: linux-next, Thomas Graf, netdev
In-Reply-To: <1249982110.13065.7.camel@HunTEr>
[-- Attachment #1: Type: text/plain, Size: 441 bytes --]
Hi,
> > > net/netlink/genetlink.c: In function `genl_register_mc_group':
> > > net/netlink/genetlink.c:139: warning: 'err' might be used uninitialized in this function
> >
> > Well, only if there's no netns which can't happen.
> So how to silence that warning?
Well, I suppose your patch is the best way anyhow, using
uninitialized_var() would seem somewhat dangerous for future
modifications of the function.
johannes
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply
* Re: [PATCH] Fix Warnings from net/netlink/genetlink.c
From: Johannes Berg @ 2009-08-11 7:36 UTC (permalink / raw)
To: vibi_sreenivasan; +Cc: linux-next, Thomas Graf, netdev
In-Reply-To: <1249975630.2400.7.camel@HunTEr>
[-- Attachment #1: Type: text/plain, Size: 1181 bytes --]
On Tue, 2009-08-11 at 12:57 +0530, vibi sreenivasan wrote:
> Fix following compiler warnings
>
> net/netlink/genetlink.c: In function `genl_register_mc_group':
> net/netlink/genetlink.c:139: warning: 'err' might be used uninitialized in this function
Well, only if there's no netns which can't happen.
However, technical problems prohibit your patch from being applied.
a) you sent it to the wrong list, copying netdev
> Signed-off-by: vibi sreenivasan, CMS COMPUTERS LTD, INDIA <vibi_sreenivasan@cms.com>
b) this isn't correctly formatted, have you actually read
Documentation/SubmittingPatches including the legal text that you're
agreeing to (section 12 of that document)?
johannes
> net/netlink/genetlink.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
> index 575c643..66f6ba0 100644
> --- a/net/netlink/genetlink.c
> +++ b/net/netlink/genetlink.c
> @@ -136,7 +136,7 @@ int genl_register_mc_group(struct genl_family *family,
> {
> int id;
> unsigned long *new_groups;
> - int err;
> + int err = 0;
>
> BUG_ON(grp->name[0] == '\0');
>
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply
* [PATCH]:Fix warning from drivers/pcmcia/at91_cf.c
From: vibi sreenivasan @ 2009-08-11 9:01 UTC (permalink / raw)
To: linux-next; +Cc: Andrew Victor, linux-arm-kernel
Patch Fixes the following warning
drivers/pcmcia/at91_cf.c:55:1: warning: "SZ_2K" redefined
In file included from
arch/arm/mach-at91/include/mach/hardware.h:17,
from
arch/arm/mach-at91/include/mach/memory.h:24,
from /media/skub/linux-git-wkg/linux-git/linux-next/arch/arm/include/asm/memory.h:18,
from /media/skub/linux-git-wkg/linux-git/linux-next/arch/arm/include/asm/page.h:197,
from include/linux/mmzone.h:20,
from include/linux/gfp.h:4,
from include/linux/kmod.h:22,
from include/linux/module.h:13,
from drivers/pcmcia/at91_cf.c:12:
/media/skub/linux-git-wkg/linux-git/linux-next/arch/arm/include/asm/sizes.h:32:1: warning: this is the location of the previous definition
Signed-off-by: vibi sreenivasan, CMS COMPUTERS LTD, INDIA
<vibi_sreenivasan@cms.com>
---
drivers/pcmcia/at91_cf.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index 9e1140f..a5a7842 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -52,7 +52,6 @@ struct at91_cf_socket {
unsigned long phys_baseaddr;
};
-#define SZ_2K (2 * SZ_1K)
static inline int at91_cf_present(struct at91_cf_socket *cf)
{
--
1.6.3.3
^ permalink raw reply
* Re: linux-next: nfsd tree build warning
From: J. Bruce Fields @ 2009-08-11 16:53 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20090811110749.040661e0.sfr@canb.auug.org.au>
On Tue, Aug 11, 2009 at 11:07:49AM +1000, Stephen Rothwell wrote:
> Today's linux-next build (powerpc ppc64_defconfig) produced this warning:
>
> net/sunrpc/svc_xprt.c: In function 'svc_pool_stats_show':
> net/sunrpc/svc_xprt.c:1211: warning: too few arguments for format
>
> Caused by commit ffcef87a1f31094709da615454b5911f3711bc65 ("Revert
> "knfsd: avoid overloading the CPU scheduler with enormous load
> averages"").
Whoops, thanks: fixed.
--b.
^ permalink raw reply
* [PATCH -next] usb/otg: fix twl4030-usb build
From: Randy Dunlap @ 2009-08-11 18:31 UTC (permalink / raw)
To: Stephen Rothwell, Felipe Balbi, gregkh; +Cc: linux-next, LKML, akpm
In-Reply-To: <20090811183434.28afaf80.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
subsys_initcall_sync() is only defined for built-in code, not for
loadable modules, so this driver build fails when built as a module.
However, the _sync() forms of the initcalls are not implemented,
so this should not be used -- just use the non-sync form of it.
drivers/usb/otg/twl4030-usb.c:777: warning: data definition has no type or storage class
drivers/usb/otg/twl4030-usb.c:777: warning: type defaults to 'int' in declaration of 'subsys_initcall_sync'
drivers/usb/otg/twl4030-usb.c:777: warning: parameter names (without types) in function declaration
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Felipe Balbi <felipe.balbi@nokia.com>
---
drivers/usb/otg/twl4030-usb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20090811.orig/drivers/usb/otg/twl4030-usb.c
+++ linux-next-20090811/drivers/usb/otg/twl4030-usb.c
@@ -774,7 +774,7 @@ static int __init twl4030_usb_init(void)
{
return platform_driver_register(&twl4030_usb_driver);
}
-subsys_initcall_sync(twl4030_usb_init);
+subsys_initcall(twl4030_usb_init);
static void __exit twl4030_usb_exit(void)
{
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox