* linux-next: Tree for March 1 @ 2011-03-01 7:11 Stephen Rothwell 2011-03-01 18:49 ` linux-next: Tree for March 1 (staging/winbond) Randy Dunlap 2011-03-02 0:29 ` [PATCH -next] staging/brcm80211: fix printk format warnings Randy Dunlap 0 siblings, 2 replies; 15+ messages in thread From: Stephen Rothwell @ 2011-03-01 7:11 UTC (permalink / raw) To: linux-next; +Cc: LKML [-- Attachment #1: Type: text/plain, Size: 10322 bytes --] Hi all, Changes since 20110228: Dropped tree: xen The ext4 tree lost its conflict. The v4l-dvb tree still has its build failure so I used the version from next-20110225. The kvm tree lost its build failure. The sound and sound-asoc trees lost their build failure. The mfd tree gained conflicts against the i.MX tree. The devicetree tree lost its conflict but gained a build failure for which I applied a patch. The powerpc allyesconfig build is still broken by some obscure bloating of the low memory code. ---------------------------------------------------------------------------- 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 187 trees (counting Linus' and 28 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do. Status of my local build tests will be at 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 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 kbuild-current/rc-fixes Merging arm-current/master Merging m68k-current/for-linus Merging powerpc-merge/merge Merging 52xx-and-virtex-current/powerpc/merge Merging sparc-current/master Merging scsi-rc-fixes/master Merging net-current/master Merging sound-current/for-linus Merging pci-current/for-linus Merging wireless-current/master Merging driver-core.current/driver-core-linus Merging tty.current/tty-linus Merging usb.current/usb-linus Merging staging.current/staging-linus Merging cpufreq-current/fixes Merging input-current/for-linus Merging md-current/for-linus Merging audit-current/for-linus Merging crypto-current/master Merging ide-curent/master Merging dwmw2/master Merging sh-current/sh-fixes-for-linus Merging rmobile-current/rmobile-fixes-for-linus Merging fbdev-current/fbdev-fixes-for-linus Merging devicetree-current/devicetree/merge Merging spi-current/spi/merge Merging arm/for-next Merging davinci/davinci-next Merging i.MX/for-next Merging linux-spec/for-next Merging msm/for-next CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x27.c CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x30.c CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-qsd8x50.c CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-sapphire.c CONFLICT (content): Merge conflict in arch/arm/mach-msm/include/mach/memory.h Merging omap/for-next Merging pxa/for-next Merging samsung/next-samsung Merging s5p/for-next Merging tegra/for-next Merging ux500-core/ux500-core CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.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 microblaze/next Merging mips/mips-for-linux-next Merging parisc/for-next Merging powerpc/next Merging 4xx/next Merging 52xx-and-virtex/powerpc/next Merging galak/next Merging s390/features Merging sh/sh-latest Merging rmobile/rmobile-latest Merging sparc/master Merging tile/master Merging unicore32/unicore32 Merging xtensa/master CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig 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 hfsplus/for-next Merging jfs/next Merging logfs/master CONFLICT (content): Merge conflict in fs/logfs/logfs.h Merging nfs/linux-next Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Merging omfs/for-next Merging squashfs/master Merging udf/for_next Merging v9fs/for-next Merging ubifs/linux-next Merging xfs/master Merging vfs/for-next Merging vfs-scale/vfs-scale-working Merging pci/linux-next Merging hid/for-next Merging quilt/i2c Merging bjdooks-i2c/next-i2c Merging quilt/jdelvare-hwmon Merging hwmon-staging/hwmon-next CONFLICT (content): Merge conflict in drivers/hwmon/Makefile Merging quilt/kernel-doc Merging v4l-dvb/master $ git reset --hard HEAD^ Merging refs/next/20110225/v4l-dvb Merging kbuild/for-next Merging kconfig/for-next Merging ide/master Merging libata/NEXT Merging infiniband/for-next Merging acpi/test Merging idle-test/idle-test Merging powertools/tools-test Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/linux-next Merging dlm/next Merging swiotlb/master Merging ibft/master Merging scsi/master CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_ata.c CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c Merging async_tx/next Merging net/master Merging wireless/master Merging bluetooth/master Merging mtd/master Merging crypto/master Merging sound/for-next Merging sound-asoc/for-next Merging cpufreq/next Merging quilt/rr Merging input/next Merging input-mt/next Merging lsm/for-next Merging block/for-next Merging quilt/device-mapper Merging embedded/master Merging firmware/master Merging pcmcia/master Merging battery/master Merging leds/for-mm CONFLICT (content): Merge conflict in drivers/leds/Kconfig Merging backlight/for-mm Merging mmc/mmc-next Merging kgdb/kgdb-next Merging slab/for-next Merging uclinux/for-next Merging md/for-next Merging mfd/for-next CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-mx27_3ds.c CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-pcm038.c CONFLICT (content): Merge conflict in arch/arm/mach-mx3/mach-mx31_3ds.c CONFLICT (content): Merge conflict in arch/arm/mach-mx3/mach-mx31moboard.c Merging hdlc/hdlc-next Merging drm/drm-next Merging fbdev/master Merging viafb/viafb-next Merging omap_dss2/for-next Merging voltage/for-next Merging security-testing/next Merging selinux/master Merging lblnet/master Merging agp/agp-next 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 CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in fs/eventpoll.c Merging audit/for-next Merging suspend/linux-next Merging fsnotify/for-next Merging irda/for-next Merging catalin/for-next Merging alacrity/linux-next CONFLICT (content): Merge conflict in drivers/Makefile CONFLICT (content): Merge conflict in include/linux/Kbuild CONFLICT (content): Merge conflict in lib/Kconfig Merging i7core_edac/linux_next Merging i7300_edac/linux_next Merging devicetree/devicetree/next Merging spi/spi/next Merging tip/auto-latest CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/sleep.c Merging rcu/rcu/next Merging oprofile/for-next Merging xen-two/linux-next Merging xen-pvhvm/linux-next Merging edac-amd/for-next CONFLICT (content): Merge conflict in include/linux/pci_ids.h Merging percpu/for-next CONFLICT (content): Merge conflict in arch/x86/kernel/vmlinux.lds.S Merging workqueues/for-next Merging sfi/sfi-test Merging asm-generic/next Merging drivers-x86/linux-next CONFLICT (content): Merge conflict in drivers/hwmon/lm85.c Applying: OLPC: fix for removal of run_wake_count Merging hwpoison/hwpoison Merging sysctl/master Merging driver-core/driver-core-next Merging tty/tty-next CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile Merging usb/usb-next CONFLICT (content): Merge conflict in drivers/usb/gadget/Kconfig Merging staging/staging-next CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c Merging slabh/slabh Merging bkl-trivial/trivial Merging bkl-llseek/llseek Merging bkl-vfs/vfs Merging bkl-config/config CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c CONFLICT (content): Merge conflict in drivers/scsi/pm8001/pm8001_sas.h CONFLICT (content): Merge conflict in drivers/staging/Kconfig CONFLICT (delete/modify): drivers/staging/stradis/Kconfig deleted in HEAD and modified in bkl-config/config. Version bkl-config/config of drivers/staging/stradis/Kconfig left in tree. CONFLICT (content): Merge conflict in fs/nfsd/nfs4state.c CONFLICT (content): Merge conflict in include/linux/hardirq.h CONFLICT (content): Merge conflict in include/linux/smp_lock.h $ git rm -f drivers/staging/stradis/Kconfig Merging cleancache/linux-next CONFLICT (content): Merge conflict in fs/ocfs2/super.c CONFLICT (content): Merge conflict in fs/super.c CONFLICT (content): Merge conflict in include/linux/fs.h CONFLICT (content): Merge conflict in mm/Kconfig Merging scsi-post-merge/merge-base:master $ git checkout scsi-post-merge/master Applying: dt: fix typo [-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 1 (staging/winbond) 2011-03-01 7:11 linux-next: Tree for March 1 Stephen Rothwell @ 2011-03-01 18:49 ` Randy Dunlap 2011-03-01 19:10 ` Pekka Enberg 2011-03-02 0:29 ` [PATCH -next] staging/brcm80211: fix printk format warnings Randy Dunlap 1 sibling, 1 reply; 15+ messages in thread From: Randy Dunlap @ 2011-03-01 18:49 UTC (permalink / raw) To: Stephen Rothwell, Pekka Enberg; +Cc: linux-next, LKML, gregkh On Tue, 1 Mar 2011 18:11:19 +1100 Stephen Rothwell wrote: > Hi all, > > Changes since 20110228: commit ddee7e28e7d5e4ba2b8537c6a59b035745c250bb Author: Pekka Enberg <penberg@kernel.org> Date: Sun Nov 28 23:00:01 2010 +0200 Staging: w35und: Remove empty sysdef.h header This header should not have been empty, since in commit 412dc7f368bf10a8049a8a4c41abbfd0108742e7 Author: Randy Dunlap <randy.dunlap@oracle.com> Date: Fri Nov 19 09:30:18 2010 -0800 staging: fix winbond build, needs delay.h I added delay.h to it. And now we have the same build errors that I fixed last November: drivers/staging/winbond/phy_calibration.c:986: error: implicit declaration of function 'msleep' drivers/staging/winbond/phy_calibration.c:1555: error: implicit declaration of function 'udelay' drivers/staging/winbond/reg.c:893: error: implicit declaration of function 'msleep' drivers/staging/winbond/reg.c:1169: error: implicit declaration of function 'udelay' --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 1 (staging/winbond) 2011-03-01 18:49 ` linux-next: Tree for March 1 (staging/winbond) Randy Dunlap @ 2011-03-01 19:10 ` Pekka Enberg 2011-03-01 19:19 ` Randy Dunlap 0 siblings, 1 reply; 15+ messages in thread From: Pekka Enberg @ 2011-03-01 19:10 UTC (permalink / raw) To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, gregkh On Tue, Mar 1, 2011 at 8:49 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: > On Tue, 1 Mar 2011 18:11:19 +1100 Stephen Rothwell wrote: > >> Hi all, >> >> Changes since 20110228: > > > commit ddee7e28e7d5e4ba2b8537c6a59b035745c250bb > Author: Pekka Enberg <penberg@kernel.org> > Date: Sun Nov 28 23:00:01 2010 +0200 > Staging: w35und: Remove empty sysdef.h header > > > This header should not have been empty, since in > > commit 412dc7f368bf10a8049a8a4c41abbfd0108742e7 > Author: Randy Dunlap <randy.dunlap@oracle.com> > Date: Fri Nov 19 09:30:18 2010 -0800 > staging: fix winbond build, needs delay.h > > I added delay.h to it. And now we have the same build > errors that I fixed last November: > > drivers/staging/winbond/phy_calibration.c:986: error: implicit declaration of function 'msleep' > drivers/staging/winbond/phy_calibration.c:1555: error: implicit declaration of function 'udelay' > drivers/staging/winbond/reg.c:893: error: implicit declaration of function 'msleep' > drivers/staging/winbond/reg.c:1169: error: implicit declaration of function 'udelay' Strange. I didn't see the problem. We should add delay.h to phy_calibration.c and reg.c instead. Care to make a patch? ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 1 (staging/winbond) 2011-03-01 19:10 ` Pekka Enberg @ 2011-03-01 19:19 ` Randy Dunlap 2011-03-01 19:35 ` Pekka Enberg 0 siblings, 1 reply; 15+ messages in thread From: Randy Dunlap @ 2011-03-01 19:19 UTC (permalink / raw) To: Pekka Enberg; +Cc: Stephen Rothwell, linux-next, LKML, gregkh On Tue, 1 Mar 2011 21:10:23 +0200 Pekka Enberg wrote: > On Tue, Mar 1, 2011 at 8:49 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: > > On Tue, 1 Mar 2011 18:11:19 +1100 Stephen Rothwell wrote: > > > >> Hi all, > >> > >> Changes since 20110228: > > > > > > commit ddee7e28e7d5e4ba2b8537c6a59b035745c250bb > > Author: Pekka Enberg <penberg@kernel.org> > > Date: Sun Nov 28 23:00:01 2010 +0200 > > Staging: w35und: Remove empty sysdef.h header > > > > > > This header should not have been empty, since in > > > > commit 412dc7f368bf10a8049a8a4c41abbfd0108742e7 > > Author: Randy Dunlap <randy.dunlap@oracle.com> > > Date: Fri Nov 19 09:30:18 2010 -0800 > > staging: fix winbond build, needs delay.h > > > > I added delay.h to it. And now we have the same build > > errors that I fixed last November: > > > > drivers/staging/winbond/phy_calibration.c:986: error: implicit declaration of function 'msleep' > > drivers/staging/winbond/phy_calibration.c:1555: error: implicit declaration of function 'udelay' > > drivers/staging/winbond/reg.c:893: error: implicit declaration of function 'msleep' > > drivers/staging/winbond/reg.c:1169: error: implicit declaration of function 'udelay' > > Strange. I didn't see the problem. We should add delay.h to > phy_calibration.c and reg.c instead. Care to make a patch? > -- No thanks, I'll let the staging people do that. --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 1 (staging/winbond) 2011-03-01 19:19 ` Randy Dunlap @ 2011-03-01 19:35 ` Pekka Enberg 2011-03-01 19:39 ` Randy Dunlap 0 siblings, 1 reply; 15+ messages in thread From: Pekka Enberg @ 2011-03-01 19:35 UTC (permalink / raw) To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, gregkh On Tue, Mar 1, 2011 at 9:19 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: > On Tue, 1 Mar 2011 21:10:23 +0200 Pekka Enberg wrote: > >> On Tue, Mar 1, 2011 at 8:49 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: >> > On Tue, 1 Mar 2011 18:11:19 +1100 Stephen Rothwell wrote: >> > >> >> Hi all, >> >> >> >> Changes since 20110228: >> > >> > >> > commit ddee7e28e7d5e4ba2b8537c6a59b035745c250bb >> > Author: Pekka Enberg <penberg@kernel.org> >> > Date: Sun Nov 28 23:00:01 2010 +0200 >> > Staging: w35und: Remove empty sysdef.h header >> > >> > >> > This header should not have been empty, since in >> > >> > commit 412dc7f368bf10a8049a8a4c41abbfd0108742e7 >> > Author: Randy Dunlap <randy.dunlap@oracle.com> >> > Date: Fri Nov 19 09:30:18 2010 -0800 >> > staging: fix winbond build, needs delay.h >> > >> > I added delay.h to it. And now we have the same build >> > errors that I fixed last November: >> > >> > drivers/staging/winbond/phy_calibration.c:986: error: implicit declaration of function 'msleep' >> > drivers/staging/winbond/phy_calibration.c:1555: error: implicit declaration of function 'udelay' >> > drivers/staging/winbond/reg.c:893: error: implicit declaration of function 'msleep' >> > drivers/staging/winbond/reg.c:1169: error: implicit declaration of function 'udelay' >> >> Strange. I didn't see the problem. We should add delay.h to >> phy_calibration.c and reg.c instead. Care to make a patch? >> -- > > No thanks, I'll let the staging people do that. Hmm, commit cecf826df8648c843ea8db63b1f82c154a74db36 ("staging: winbond: needs <linux/delay.h> for msleep and friends") should fix it. Isn't it in linux-next yet? ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 1 (staging/winbond) 2011-03-01 19:35 ` Pekka Enberg @ 2011-03-01 19:39 ` Randy Dunlap 2011-03-01 20:05 ` Pekka Enberg 2011-03-01 20:07 ` Greg KH 0 siblings, 2 replies; 15+ messages in thread From: Randy Dunlap @ 2011-03-01 19:39 UTC (permalink / raw) To: Pekka Enberg; +Cc: Stephen Rothwell, linux-next, LKML, gregkh On Tue, 1 Mar 2011 21:35:59 +0200 Pekka Enberg wrote: > On Tue, Mar 1, 2011 at 9:19 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: > > On Tue, 1 Mar 2011 21:10:23 +0200 Pekka Enberg wrote: > > > >> On Tue, Mar 1, 2011 at 8:49 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: > >> > On Tue, 1 Mar 2011 18:11:19 +1100 Stephen Rothwell wrote: > >> > > >> >> Hi all, > >> >> > >> >> Changes since 20110228: > >> > > >> > > >> > commit ddee7e28e7d5e4ba2b8537c6a59b035745c250bb > >> > Author: Pekka Enberg <penberg@kernel.org> > >> > Date: Sun Nov 28 23:00:01 2010 +0200 > >> > Staging: w35und: Remove empty sysdef.h header > >> > > >> > > >> > This header should not have been empty, since in > >> > > >> > commit 412dc7f368bf10a8049a8a4c41abbfd0108742e7 > >> > Author: Randy Dunlap <randy.dunlap@oracle.com> > >> > Date: Fri Nov 19 09:30:18 2010 -0800 > >> > staging: fix winbond build, needs delay.h > >> > > >> > I added delay.h to it. And now we have the same build > >> > errors that I fixed last November: > >> > > >> > drivers/staging/winbond/phy_calibration.c:986: error: implicit declaration of function 'msleep' > >> > drivers/staging/winbond/phy_calibration.c:1555: error: implicit declaration of function 'udelay' > >> > drivers/staging/winbond/reg.c:893: error: implicit declaration of function 'msleep' > >> > drivers/staging/winbond/reg.c:1169: error: implicit declaration of function 'udelay' > >> > >> Strange. I didn't see the problem. We should add delay.h to > >> phy_calibration.c and reg.c instead. Care to make a patch? > >> -- > > > > No thanks, I'll let the staging people do that. > > Hmm, commit cecf826df8648c843ea8db63b1f82c154a74db36 ("staging: > winbond: needs <linux/delay.h> for msleep and friends") should fix it. > Isn't it in linux-next yet? I'll have to let GregKH answer that. Where is the commit ID from? --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 1 (staging/winbond) 2011-03-01 19:39 ` Randy Dunlap @ 2011-03-01 20:05 ` Pekka Enberg 2011-03-01 20:07 ` Greg KH 1 sibling, 0 replies; 15+ messages in thread From: Pekka Enberg @ 2011-03-01 20:05 UTC (permalink / raw) To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, gregkh On Tue, 2011-03-01 at 11:39 -0800, Randy Dunlap wrote: > On Tue, 1 Mar 2011 21:35:59 +0200 Pekka Enberg wrote: > > > On Tue, Mar 1, 2011 at 9:19 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: > > > On Tue, 1 Mar 2011 21:10:23 +0200 Pekka Enberg wrote: > > > > > >> On Tue, Mar 1, 2011 at 8:49 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: > > >> > On Tue, 1 Mar 2011 18:11:19 +1100 Stephen Rothwell wrote: > > >> > > > >> >> Hi all, > > >> >> > > >> >> Changes since 20110228: > > >> > > > >> > > > >> > commit ddee7e28e7d5e4ba2b8537c6a59b035745c250bb > > >> > Author: Pekka Enberg <penberg@kernel.org> > > >> > Date: Sun Nov 28 23:00:01 2010 +0200 > > >> > Staging: w35und: Remove empty sysdef.h header > > >> > > > >> > > > >> > This header should not have been empty, since in > > >> > > > >> > commit 412dc7f368bf10a8049a8a4c41abbfd0108742e7 > > >> > Author: Randy Dunlap <randy.dunlap@oracle.com> > > >> > Date: Fri Nov 19 09:30:18 2010 -0800 > > >> > staging: fix winbond build, needs delay.h > > >> > > > >> > I added delay.h to it. And now we have the same build > > >> > errors that I fixed last November: > > >> > > > >> > drivers/staging/winbond/phy_calibration.c:986: error: implicit declaration of function 'msleep' > > >> > drivers/staging/winbond/phy_calibration.c:1555: error: implicit declaration of function 'udelay' > > >> > drivers/staging/winbond/reg.c:893: error: implicit declaration of function 'msleep' > > >> > drivers/staging/winbond/reg.c:1169: error: implicit declaration of function 'udelay' > > >> > > >> Strange. I didn't see the problem. We should add delay.h to > > >> phy_calibration.c and reg.c instead. Care to make a patch? > > >> -- > > > > > > No thanks, I'll let the staging people do that. > > > > Hmm, commit cecf826df8648c843ea8db63b1f82c154a74db36 ("staging: > > winbond: needs <linux/delay.h> for msleep and friends") should fix it. > > Isn't it in linux-next yet? > > I'll have to let GregKH answer that. > > Where is the commit ID from? It's from staging tree staging-next branch. Pekka ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 1 (staging/winbond) 2011-03-01 19:39 ` Randy Dunlap 2011-03-01 20:05 ` Pekka Enberg @ 2011-03-01 20:07 ` Greg KH 1 sibling, 0 replies; 15+ messages in thread From: Greg KH @ 2011-03-01 20:07 UTC (permalink / raw) To: Randy Dunlap; +Cc: Pekka Enberg, Stephen Rothwell, linux-next, LKML On Tue, Mar 01, 2011 at 11:39:30AM -0800, Randy Dunlap wrote: > On Tue, 1 Mar 2011 21:35:59 +0200 Pekka Enberg wrote: > > > On Tue, Mar 1, 2011 at 9:19 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: > > > On Tue, 1 Mar 2011 21:10:23 +0200 Pekka Enberg wrote: > > > > > >> On Tue, Mar 1, 2011 at 8:49 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: > > >> > On Tue, 1 Mar 2011 18:11:19 +1100 Stephen Rothwell wrote: > > >> > > > >> >> Hi all, > > >> >> > > >> >> Changes since 20110228: > > >> > > > >> > > > >> > commit ddee7e28e7d5e4ba2b8537c6a59b035745c250bb > > >> > Author: Pekka Enberg <penberg@kernel.org> > > >> > Date: Sun Nov 28 23:00:01 2010 +0200 > > >> > Staging: w35und: Remove empty sysdef.h header > > >> > > > >> > > > >> > This header should not have been empty, since in > > >> > > > >> > commit 412dc7f368bf10a8049a8a4c41abbfd0108742e7 > > >> > Author: Randy Dunlap <randy.dunlap@oracle.com> > > >> > Date: Fri Nov 19 09:30:18 2010 -0800 > > >> > staging: fix winbond build, needs delay.h > > >> > > > >> > I added delay.h to it. And now we have the same build > > >> > errors that I fixed last November: > > >> > > > >> > drivers/staging/winbond/phy_calibration.c:986: error: implicit declaration of function 'msleep' > > >> > drivers/staging/winbond/phy_calibration.c:1555: error: implicit declaration of function 'udelay' > > >> > drivers/staging/winbond/reg.c:893: error: implicit declaration of function 'msleep' > > >> > drivers/staging/winbond/reg.c:1169: error: implicit declaration of function 'udelay' > > >> > > >> Strange. I didn't see the problem. We should add delay.h to > > >> phy_calibration.c and reg.c instead. Care to make a patch? > > >> -- > > > > > > No thanks, I'll let the staging people do that. > > > > Hmm, commit cecf826df8648c843ea8db63b1f82c154a74db36 ("staging: > > winbond: needs <linux/delay.h> for msleep and friends") should fix it. > > Isn't it in linux-next yet? It should be in there tomorrow, the linux-next pull-time happened after I pushed out my trees. thanks, greg k-h ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH -next] staging/brcm80211: fix printk format warnings 2011-03-01 7:11 linux-next: Tree for March 1 Stephen Rothwell 2011-03-01 18:49 ` linux-next: Tree for March 1 (staging/winbond) Randy Dunlap @ 2011-03-02 0:29 ` Randy Dunlap 2011-03-02 14:07 ` Roland Vossen 2011-03-02 21:05 ` Greg KH 1 sibling, 2 replies; 15+ messages in thread From: Randy Dunlap @ 2011-03-02 0:29 UTC (permalink / raw) To: Stephen Rothwell, gregkh, driverdevel; +Cc: linux-next, LKML From: Randy Dunlap <randy.dunlap@oracle.com> drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c:1379: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' drivers/staging/brcm80211/sys/wl_mac80211.c:1827: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' drivers/staging/brcm80211/sys/wl_mac80211.c:1832: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> --- drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 2 +- drivers/staging/brcm80211/sys/wl_mac80211.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) --- linux-next-20110301.orig/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ linux-next-20110301/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -1376,7 +1376,7 @@ wl_cfg80211_connect(struct wiphy *wiphy, memcpy(&join_params.params.bssid, ðer_bcast, ETH_ALEN); wl_ch_to_chanspec(wl->channel, &join_params, &join_params_size); - WL_DBG("join_param_size %d\n", join_params_size); + WL_DBG("join_param_size %zd\n", join_params_size); if (join_params.ssid.SSID_len < IEEE80211_MAX_SSID_LEN) { WL_DBG("ssid \"%s\", len (%d)\n", --- linux-next-20110301.orig/drivers/staging/brcm80211/sys/wl_mac80211.c +++ linux-next-20110301/drivers/staging/brcm80211/sys/wl_mac80211.c @@ -1824,12 +1824,12 @@ int wl_check_firmwares(struct wl_info *w WL_ERROR("%s: invalid bin/hdr fw\n", __func__); rc = -EBADF; } else if (fw_hdr->size % sizeof(struct wl_fw_hdr)) { - WL_ERROR("%s: non integral fw hdr file size %d/%zu\n", + WL_ERROR("%s: non integral fw hdr file size %zd/%zu\n", __func__, fw_hdr->size, sizeof(struct wl_fw_hdr)); rc = -EBADF; } else if (fw->size < MIN_FW_SIZE || fw->size > MAX_FW_SIZE) { - WL_ERROR("%s: out of bounds fw file size %d\n", + WL_ERROR("%s: out of bounds fw file size %zd\n", __func__, fw->size); rc = -EBADF; } else { ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH -next] staging/brcm80211: fix printk format warnings 2011-03-02 0:29 ` [PATCH -next] staging/brcm80211: fix printk format warnings Randy Dunlap @ 2011-03-02 14:07 ` Roland Vossen 2011-03-02 21:02 ` Greg KH 2011-03-02 21:05 ` Greg KH 1 sibling, 1 reply; 15+ messages in thread From: Roland Vossen @ 2011-03-02 14:07 UTC (permalink / raw) To: Randy Dunlap Cc: Stephen Rothwell, gregkh@suse.de, driverdevel, linux-next@vger.kernel.org, LKML, Arend Van Spriel > drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c:1379: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' > drivers/staging/brcm80211/sys/wl_mac80211.c:1827: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' > drivers/staging/brcm80211/sys/wl_mac80211.c:1832: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' > > Signed-off-by: Randy Dunlap<randy.dunlap@oracle.com> Acked-by: Roland Vossen<rvossen@broadcom.com> Thanks Randy. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH -next] staging/brcm80211: fix printk format warnings 2011-03-02 14:07 ` Roland Vossen @ 2011-03-02 21:02 ` Greg KH 0 siblings, 0 replies; 15+ messages in thread From: Greg KH @ 2011-03-02 21:02 UTC (permalink / raw) To: Roland Vossen Cc: Randy Dunlap, Stephen Rothwell, gregkh@suse.de, driverdevel, linux-next@vger.kernel.org, LKML, Arend Van Spriel On Wed, Mar 02, 2011 at 03:07:20PM +0100, Roland Vossen wrote: > >drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c:1379: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' > >drivers/staging/brcm80211/sys/wl_mac80211.c:1827: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' > >drivers/staging/brcm80211/sys/wl_mac80211.c:1832: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' > > > >Signed-off-by: Randy Dunlap<randy.dunlap@oracle.com> > > Acked-by: Roland Vossen<rvossen@broadcom.com> Please note you need a ' ' before the '<' character. I'm getting tired of adding it myself :) thanks, greg k-h ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH -next] staging/brcm80211: fix printk format warnings 2011-03-02 0:29 ` [PATCH -next] staging/brcm80211: fix printk format warnings Randy Dunlap 2011-03-02 14:07 ` Roland Vossen @ 2011-03-02 21:05 ` Greg KH 2011-03-02 23:36 ` Stephen Rothwell 1 sibling, 1 reply; 15+ messages in thread From: Greg KH @ 2011-03-02 21:05 UTC (permalink / raw) To: Randy Dunlap; +Cc: Stephen Rothwell, gregkh, driverdevel, linux-next, LKML On Tue, Mar 01, 2011 at 04:29:48PM -0800, Randy Dunlap wrote: > From: Randy Dunlap <randy.dunlap@oracle.com> > > drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c:1379: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' > drivers/staging/brcm80211/sys/wl_mac80211.c:1827: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' > drivers/staging/brcm80211/sys/wl_mac80211.c:1832: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' > > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> > Acked-by: Roland Vossen <rvossen@broadcom.com> > --- > drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 2 +- > drivers/staging/brcm80211/sys/wl_mac80211.c | 4 ++-- This file doesn't apply to my tree at all. confused, greg k-h ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH -next] staging/brcm80211: fix printk format warnings 2011-03-02 21:05 ` Greg KH @ 2011-03-02 23:36 ` Stephen Rothwell 2011-03-03 7:20 ` Stanislav Fomichev 0 siblings, 1 reply; 15+ messages in thread From: Stephen Rothwell @ 2011-03-02 23:36 UTC (permalink / raw) To: Greg KH; +Cc: Randy Dunlap, gregkh, driverdevel, linux-next, LKML [-- Attachment #1: Type: text/plain, Size: 1114 bytes --] Hi Greg, On Wed, 2 Mar 2011 16:05:11 -0500 Greg KH <greg@kroah.com> wrote: > > On Tue, Mar 01, 2011 at 04:29:48PM -0800, Randy Dunlap wrote: > > From: Randy Dunlap <randy.dunlap@oracle.com> > > > > drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c:1379: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' > > drivers/staging/brcm80211/sys/wl_mac80211.c:1827: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' > > drivers/staging/brcm80211/sys/wl_mac80211.c:1832: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' > > > > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> > > Acked-by: Roland Vossen <rvossen@broadcom.com> > > --- > > drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 2 +- > > drivers/staging/brcm80211/sys/wl_mac80211.c | 4 ++-- > > This file doesn't apply to my tree at all. Maybe due to conflict resolutions in my tree (assuming that Randy based his patch in linux-next). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH -next] staging/brcm80211: fix printk format warnings 2011-03-02 23:36 ` Stephen Rothwell @ 2011-03-03 7:20 ` Stanislav Fomichev 2011-03-03 16:08 ` Randy Dunlap 0 siblings, 1 reply; 15+ messages in thread From: Stanislav Fomichev @ 2011-03-03 7:20 UTC (permalink / raw) To: Stephen Rothwell Cc: Greg KH, Randy Dunlap, driverdevel, gregkh, linux-next, LKML > Maybe due to conflict resolutions in my tree (assuming that Randy based > his patch in linux-next). We don't have brcm80211/sys/ directory (it was renamed to brcm80211/brcmsmac); so it's based on the wrong/outdated tree. And I suppose these errors are already fixed. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH -next] staging/brcm80211: fix printk format warnings 2011-03-03 7:20 ` Stanislav Fomichev @ 2011-03-03 16:08 ` Randy Dunlap 0 siblings, 0 replies; 15+ messages in thread From: Randy Dunlap @ 2011-03-03 16:08 UTC (permalink / raw) To: Stephen Rothwell, Greg KH, driverdevel, gregkh, linux-next, LKML On 03/02/11 23:20, Stanislav Fomichev wrote: >> Maybe due to conflict resolutions in my tree (assuming that Randy based >> his patch in linux-next). > We don't have brcm80211/sys/ directory (it was renamed to > brcm80211/brcmsmac); so it's based on the wrong/outdated tree. It was based on linux-next of 2011-0301, which is what the patch email was in reply to. > And I suppose these errors are already fixed. Good to know. Thanks. -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2011-03-03 16:09 UTC | newest] Thread overview: 15+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-03-01 7:11 linux-next: Tree for March 1 Stephen Rothwell 2011-03-01 18:49 ` linux-next: Tree for March 1 (staging/winbond) Randy Dunlap 2011-03-01 19:10 ` Pekka Enberg 2011-03-01 19:19 ` Randy Dunlap 2011-03-01 19:35 ` Pekka Enberg 2011-03-01 19:39 ` Randy Dunlap 2011-03-01 20:05 ` Pekka Enberg 2011-03-01 20:07 ` Greg KH 2011-03-02 0:29 ` [PATCH -next] staging/brcm80211: fix printk format warnings Randy Dunlap 2011-03-02 14:07 ` Roland Vossen 2011-03-02 21:02 ` Greg KH 2011-03-02 21:05 ` Greg KH 2011-03-02 23:36 ` Stephen Rothwell 2011-03-03 7:20 ` Stanislav Fomichev 2011-03-03 16:08 ` Randy Dunlap
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).