* linux-next: Tree for May 5 @ 2011-05-05 3:49 Stephen Rothwell 2011-05-06 23:13 ` [PATCH -next] soc: fix wm8958-dsp2 printk format warnings Randy Dunlap 2011-05-07 3:24 ` linux-next: Tree for May 5 Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 2 replies; 10+ messages in thread From: Stephen Rothwell @ 2011-05-05 3:49 UTC (permalink / raw) To: linux-next; +Cc: LKML [-- Attachment #1: Type: text/plain, Size: 10244 bytes --] Hi all, Changes since 20110504: New tree: apm Dropped tree: xen The powerpc tree gained a build failure for which I applied a patch. The suspend tree gained a build failure so I used the version form next-20110504. ---------------------------------------------------------------------------- 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 188 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 at91/at91-next Merging davinci/davinci-next Merging i.MX/for-next Merging linux-spec/for-next Merging msm/for-next 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 Merging xilinx/arm-next 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 CONFLICT (content): Merge conflict in include/linux/pci_ids.h Merging hid/for-next Merging quilt/i2c Merging bjdooks-i2c/next-i2c CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-core.c CONFLICT (delete/modify): drivers/i2c/busses/i2c-intel-mid.c deleted in bjdooks-i2c/next-i2c and modified in HEAD. Version HEAD of drivers/i2c/busses/i2c-intel-mid.c left in tree. CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-pxa.c $ git rm -f drivers/i2c/busses/i2c-intel-mid.c Applying: i2c-designware: mdelay use needs linux/delay.h inclusion Applying: i2c: designware-pcidrv depends on PCI Merging quilt/jdelvare-hwmon Merging hwmon-staging/hwmon-next Merging quilt/kernel-doc Merging docs/docs-move Merging v4l-dvb/master CONFLICT (content): Merge conflict in drivers/media/video/omap3isp/isp.c 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 cpupowerutils/master Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/linux-next Merging dlm/next Merging swiotlb/master Merging ibft/master Merging scsi/master Merging async_tx/next Merging net/master CONFLICT (content): Merge conflict in drivers/net/tg3.c Merging wireless/master CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/if_cs.c CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/pci.c CONFLICT (content): Merge conflict in net/bluetooth/l2cap_sock.c Merging bluetooth/master Merging mtd/master Merging crypto/master Merging sound/for-next Merging sound-asoc/for-next Merging cpufreq/next Merging cpufreq-move/move-drivers CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_stats.c 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 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 CONFLICT (content): Merge conflict in lib/flex_array.c CONFLICT (content): Merge conflict in security/selinux/avc.c CONFLICT (content): Merge conflict in security/selinux/hooks.c CONFLICT (content): Merge conflict in security/smack/smack_lsm.c 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 (delete/modify): arch/arm/mach-u300/gpio.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-u300/gpio.c left in tree. $ git rm -f arch/arm/mach-u300/gpio.c Merging audit/for-next Merging suspend/linux-next CONFLICT (content): Merge conflict in arch/x86/Kconfig $ git reset --hard HEAD^ Merging refs/next/20110504/suspend CONFLICT (content): Merge conflict in arch/x86/Kconfig [master 2a96c58] Merge commit 'refs/next/20110504/suspend' Merging apm/for-next Merging fsnotify/for-next Merging irda/for-next Merging i7core_edac/linux_next Merging i7300_edac/linux_next Merging devicetree/devicetree/next Merging spi/spi/next Merging tip/auto-latest Merging rcu/rcu/next CONFLICT (content): Merge conflict in net/core/filter.c $ git am -3 ../patches/0001-Revert-net-rcu-convert-call_rcu-sk_filter_release_rc.patch Applying: Revert "net,rcu: convert call_rcu(sk_filter_release_rcu) to kfree_rcu" Merging oprofile/for-next Merging ptrace/ptrace Merging xen-two/linux-next Merging xen-pvhvm/linux-next Merging edac-amd/for-next Merging percpu/for-next CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h Merging workqueues/for-next Merging sfi/sfi-test Merging asm-generic/next Merging drivers-x86/linux-next CONFLICT (content): Merge conflict in drivers/platform/x86/intel_pmic_gpio.c Merging hwpoison/hwpoison Merging sysctl/master Merging driver-core/driver-core-next Merging tty/tty-next CONFLICT (content): Merge conflict in drivers/bluetooth/hci_ldisc.c CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile Merging usb/usb-next CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-nuri.c CONFLICT (content): Merge conflict in drivers/usb/host/isp1760-hcd.c Merging staging/staging-next CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_pci.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_pci.c left in tree. CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_usb.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_usb.c left in tree. $ git rm -f drivers/staging/rt2860/common/cmm_data_pci.c drivers/staging/rt2860/common/cmm_data_usb.c Merging slabh/slabh Merging bkl-config/config Merging cleancache/linux-next Merging scsi-post-merge/merge-base:master Applying: powerpc: fix up mismerge in mmu_context_hash64.c [-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH -next] soc: fix wm8958-dsp2 printk format warnings 2011-05-05 3:49 linux-next: Tree for May 5 Stephen Rothwell @ 2011-05-06 23:13 ` Randy Dunlap 2011-05-08 14:01 ` Mark Brown 2011-05-07 3:24 ` linux-next: Tree for May 5 Jean-Christophe PLAGNIOL-VILLARD 1 sibling, 1 reply; 10+ messages in thread From: Randy Dunlap @ 2011-05-06 23:13 UTC (permalink / raw) To: Stephen Rothwell, Mark Brown; +Cc: linux-next, LKML From: Randy Dunlap <randy.dunlap@oracle.com> Fix printk format warnings in wm8958-dsp2.c: sound/soc/codecs/wm8958-dsp2.c:103: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' sound/soc/codecs/wm8958-dsp2.c:111: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' sound/soc/codecs/wm8958-dsp2.c:144: warning: format '%d' expects type 'int', but argument 5 has type 'size_t' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> --- sound/soc/codecs/wm8958-dsp2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- linux-next-20110505.orig/sound/soc/codecs/wm8958-dsp2.c +++ linux-next-20110505/sound/soc/codecs/wm8958-dsp2.c @@ -99,7 +99,7 @@ static int wm8958_dsp2_fw(struct snd_soc len = fw->size - len; while (len) { if (len < 12) { - dev_err(codec->dev, "%s short data block of %d\n", + dev_err(codec->dev, "%s short data block of %zd\n", name, len); goto err; } @@ -107,7 +107,7 @@ static int wm8958_dsp2_fw(struct snd_soc memcpy(&data32, data + 4, sizeof(data32)); block_len = be32_to_cpu(data32); if (block_len + 8 > len) { - dev_err(codec->dev, "%d byte block longer than file\n", + dev_err(codec->dev, "%zd byte block longer than file\n", block_len); goto err; } @@ -141,7 +141,7 @@ static int wm8958_dsp2_fw(struct snd_soc case WM_FW_BLOCK_I: case WM_FW_BLOCK_A: case WM_FW_BLOCK_C: - dev_dbg(codec->dev, "%s: %d bytes of %x@%x\n", name, + dev_dbg(codec->dev, "%s: %zd bytes of %x@%x\n", name, block_len, (data32 >> 24) & 0xff, data32 & 0xffffff); ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH -next] soc: fix wm8958-dsp2 printk format warnings 2011-05-06 23:13 ` [PATCH -next] soc: fix wm8958-dsp2 printk format warnings Randy Dunlap @ 2011-05-08 14:01 ` Mark Brown 2011-05-08 15:38 ` Randy Dunlap 0 siblings, 1 reply; 10+ messages in thread From: Mark Brown @ 2011-05-08 14:01 UTC (permalink / raw) To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML On Fri, May 06, 2011 at 04:13:10PM -0700, Randy Dunlap wrote: > From: Randy Dunlap <randy.dunlap@oracle.com> > > Fix printk format warnings in wm8958-dsp2.c: Please do try to follow the standard patch submission process: - Send patches to maintainers. - Send patches to the relevant mailing lists. - Use the relevant subsystem prefix in your commit message. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH -next] soc: fix wm8958-dsp2 printk format warnings 2011-05-08 14:01 ` Mark Brown @ 2011-05-08 15:38 ` Randy Dunlap 2011-05-08 16:06 ` Mark Brown 0 siblings, 1 reply; 10+ messages in thread From: Randy Dunlap @ 2011-05-08 15:38 UTC (permalink / raw) To: Mark Brown; +Cc: Stephen Rothwell, linux-next, LKML On 05/08/11 07:01, Mark Brown wrote: > On Fri, May 06, 2011 at 04:13:10PM -0700, Randy Dunlap wrote: >> From: Randy Dunlap <randy.dunlap@oracle.com> >> >> Fix printk format warnings in wm8958-dsp2.c: > > Please do try to follow the standard patch submission process: > > - Send patches to maintainers. > - Send patches to the relevant mailing lists. > - Use the relevant subsystem prefix in your commit message. OK, I will note this and save this email for future reference. Do I need to resend the patch? What subsystem prefix do you want to see there? from MAINTAINERS file: SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) thanks, -- ~Randy ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH -next] soc: fix wm8958-dsp2 printk format warnings 2011-05-08 15:38 ` Randy Dunlap @ 2011-05-08 16:06 ` Mark Brown 2011-05-08 16:48 ` [PATCH -next] ASoC: " Randy Dunlap 0 siblings, 1 reply; 10+ messages in thread From: Mark Brown @ 2011-05-08 16:06 UTC (permalink / raw) To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML On Sun, May 08, 2011 at 08:38:31AM -0700, Randy Dunlap wrote: > Do I need to resend the patch? Please, it'll need to at least go by Liam as well (this was the bit about making sure you send patches to maintainers). > What subsystem prefix do you want to see there? from MAINTAINERS file: > SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) The same as all the other commits in the subsystem - ASoC. MAINTAINERS won't tell you how subsystems format their commit logs, there's a few different conventions floating around (eg, [SCSI] is unusual, and some subsystems just have the driver name). ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH -next] ASoC: fix wm8958-dsp2 printk format warnings 2011-05-08 16:06 ` Mark Brown @ 2011-05-08 16:48 ` Randy Dunlap 2011-05-11 14:05 ` Liam Girdwood 2011-05-11 16:16 ` Mark Brown 0 siblings, 2 replies; 10+ messages in thread From: Randy Dunlap @ 2011-05-08 16:48 UTC (permalink / raw) To: Mark Brown, Liam Girdwood; +Cc: Stephen Rothwell, linux-next, LKML From: Randy Dunlap <randy.dunlap@oracle.com> Fix printk format warnings in wm8958-dsp2.c: sound/soc/codecs/wm8958-dsp2.c:103: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' sound/soc/codecs/wm8958-dsp2.c:111: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' sound/soc/codecs/wm8958-dsp2.c:144: warning: format '%d' expects type 'int', but argument 5 has type 'size_t' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> --- sound/soc/codecs/wm8958-dsp2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- linux-next-20110505.orig/sound/soc/codecs/wm8958-dsp2.c +++ linux-next-20110505/sound/soc/codecs/wm8958-dsp2.c @@ -99,7 +99,7 @@ static int wm8958_dsp2_fw(struct snd_soc len = fw->size - len; while (len) { if (len < 12) { - dev_err(codec->dev, "%s short data block of %d\n", + dev_err(codec->dev, "%s short data block of %zd\n", name, len); goto err; } @@ -107,7 +107,7 @@ static int wm8958_dsp2_fw(struct snd_soc memcpy(&data32, data + 4, sizeof(data32)); block_len = be32_to_cpu(data32); if (block_len + 8 > len) { - dev_err(codec->dev, "%d byte block longer than file\n", + dev_err(codec->dev, "%zd byte block longer than file\n", block_len); goto err; } @@ -141,7 +141,7 @@ static int wm8958_dsp2_fw(struct snd_soc case WM_FW_BLOCK_I: case WM_FW_BLOCK_A: case WM_FW_BLOCK_C: - dev_dbg(codec->dev, "%s: %d bytes of %x@%x\n", name, + dev_dbg(codec->dev, "%s: %zd bytes of %x@%x\n", name, block_len, (data32 >> 24) & 0xff, data32 & 0xffffff); ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH -next] ASoC: fix wm8958-dsp2 printk format warnings 2011-05-08 16:48 ` [PATCH -next] ASoC: " Randy Dunlap @ 2011-05-11 14:05 ` Liam Girdwood 2011-05-11 16:16 ` Mark Brown 1 sibling, 0 replies; 10+ messages in thread From: Liam Girdwood @ 2011-05-11 14:05 UTC (permalink / raw) To: Randy Dunlap; +Cc: Mark Brown, Stephen Rothwell, linux-next, LKML On Sun, 2011-05-08 at 09:48 -0700, Randy Dunlap wrote: > From: Randy Dunlap <randy.dunlap@oracle.com> > > Fix printk format warnings in wm8958-dsp2.c: > > sound/soc/codecs/wm8958-dsp2.c:103: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' > sound/soc/codecs/wm8958-dsp2.c:111: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' > sound/soc/codecs/wm8958-dsp2.c:144: warning: format '%d' expects type 'int', but argument 5 has type 'size_t' > > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> > --- > sound/soc/codecs/wm8958-dsp2.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > --- linux-next-20110505.orig/sound/soc/codecs/wm8958-dsp2.c > +++ linux-next-20110505/sound/soc/codecs/wm8958-dsp2.c > @@ -99,7 +99,7 @@ static int wm8958_dsp2_fw(struct snd_soc > len = fw->size - len; > while (len) { > if (len < 12) { > - dev_err(codec->dev, "%s short data block of %d\n", > + dev_err(codec->dev, "%s short data block of %zd\n", > name, len); > goto err; > } > @@ -107,7 +107,7 @@ static int wm8958_dsp2_fw(struct snd_soc > memcpy(&data32, data + 4, sizeof(data32)); > block_len = be32_to_cpu(data32); > if (block_len + 8 > len) { > - dev_err(codec->dev, "%d byte block longer than file\n", > + dev_err(codec->dev, "%zd byte block longer than file\n", > block_len); > goto err; > } > @@ -141,7 +141,7 @@ static int wm8958_dsp2_fw(struct snd_soc > case WM_FW_BLOCK_I: > case WM_FW_BLOCK_A: > case WM_FW_BLOCK_C: > - dev_dbg(codec->dev, "%s: %d bytes of %x@%x\n", name, > + dev_dbg(codec->dev, "%s: %zd bytes of %x@%x\n", name, > block_len, (data32 >> 24) & 0xff, > data32 & 0xffffff); Acked-by: Liam Girdwood <lrg@ti.com> ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH -next] ASoC: fix wm8958-dsp2 printk format warnings 2011-05-08 16:48 ` [PATCH -next] ASoC: " Randy Dunlap 2011-05-11 14:05 ` Liam Girdwood @ 2011-05-11 16:16 ` Mark Brown 1 sibling, 0 replies; 10+ messages in thread From: Mark Brown @ 2011-05-11 16:16 UTC (permalink / raw) To: Randy Dunlap; +Cc: Liam Girdwood, Stephen Rothwell, linux-next, LKML On Sun, May 08, 2011 at 09:48:24AM -0700, Randy Dunlap wrote: > From: Randy Dunlap <randy.dunlap@oracle.com> > > Fix printk format warnings in wm8958-dsp2.c: Applied, thanks. With warnings like this it's useful to note which platform you see things on - this doesn't occur on ARM for example. I suspect it's a 64 bit or compiler version issue but ICBW. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: Tree for May 5 2011-05-05 3:49 linux-next: Tree for May 5 Stephen Rothwell 2011-05-06 23:13 ` [PATCH -next] soc: fix wm8958-dsp2 printk format warnings Randy Dunlap @ 2011-05-07 3:24 ` Jean-Christophe PLAGNIOL-VILLARD 2011-05-09 5:54 ` Stephen Rothwell 1 sibling, 1 reply; 10+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-05-07 3:24 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, LKML HI, on at91 at91sam9261ek_defconfig and at91sam9263ek_defconfig will not exist next merge window as we merge all 9263 and 9261 in at91sam9263_defconfig and at91sam9261_defconfig respectively for at91rm9200 there are all merged in at91rm9200_defconfig in previous release so ecbat91_defconfig does not exist anymore Best Regards, J. On 13:49 Thu 05 May , Stephen Rothwell wrote: > Hi all, > > Changes since 20110504: > > New tree: apm > > Dropped tree: xen > > The powerpc tree gained a build failure for which I applied a patch. > > The suspend tree gained a build failure so I used the version form > next-20110504. > > ---------------------------------------------------------------------------- > > 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 188 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 at91/at91-next > Merging davinci/davinci-next > Merging i.MX/for-next > Merging linux-spec/for-next > Merging msm/for-next > 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 > Merging xilinx/arm-next > 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 > CONFLICT (content): Merge conflict in include/linux/pci_ids.h > Merging hid/for-next > Merging quilt/i2c > Merging bjdooks-i2c/next-i2c > CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c > CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-core.c > CONFLICT (delete/modify): drivers/i2c/busses/i2c-intel-mid.c deleted in bjdooks-i2c/next-i2c and modified in HEAD. Version HEAD of drivers/i2c/busses/i2c-intel-mid.c left in tree. > CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-pxa.c > $ git rm -f drivers/i2c/busses/i2c-intel-mid.c > Applying: i2c-designware: mdelay use needs linux/delay.h inclusion > Applying: i2c: designware-pcidrv depends on PCI > Merging quilt/jdelvare-hwmon > Merging hwmon-staging/hwmon-next > Merging quilt/kernel-doc > Merging docs/docs-move > Merging v4l-dvb/master > CONFLICT (content): Merge conflict in drivers/media/video/omap3isp/isp.c > 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 cpupowerutils/master > Merging ieee1394/for-next > Merging ubi/linux-next > Merging kvm/linux-next > Merging dlm/next > Merging swiotlb/master > Merging ibft/master > Merging scsi/master > Merging async_tx/next > Merging net/master > CONFLICT (content): Merge conflict in drivers/net/tg3.c > Merging wireless/master > CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/if_cs.c > CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/pci.c > CONFLICT (content): Merge conflict in net/bluetooth/l2cap_sock.c > Merging bluetooth/master > Merging mtd/master > Merging crypto/master > Merging sound/for-next > Merging sound-asoc/for-next > Merging cpufreq/next > Merging cpufreq-move/move-drivers > CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_stats.c > 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 > 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 > CONFLICT (content): Merge conflict in lib/flex_array.c > CONFLICT (content): Merge conflict in security/selinux/avc.c > CONFLICT (content): Merge conflict in security/selinux/hooks.c > CONFLICT (content): Merge conflict in security/smack/smack_lsm.c > 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 (delete/modify): arch/arm/mach-u300/gpio.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-u300/gpio.c left in tree. > $ git rm -f arch/arm/mach-u300/gpio.c > Merging audit/for-next > Merging suspend/linux-next > CONFLICT (content): Merge conflict in arch/x86/Kconfig > $ git reset --hard HEAD^ > Merging refs/next/20110504/suspend > CONFLICT (content): Merge conflict in arch/x86/Kconfig > [master 2a96c58] Merge commit 'refs/next/20110504/suspend' > Merging apm/for-next > Merging fsnotify/for-next > Merging irda/for-next > Merging i7core_edac/linux_next > Merging i7300_edac/linux_next > Merging devicetree/devicetree/next > Merging spi/spi/next > Merging tip/auto-latest > Merging rcu/rcu/next > CONFLICT (content): Merge conflict in net/core/filter.c > $ git am -3 ../patches/0001-Revert-net-rcu-convert-call_rcu-sk_filter_release_rc.patch > Applying: Revert "net,rcu: convert call_rcu(sk_filter_release_rcu) to kfree_rcu" > Merging oprofile/for-next > Merging ptrace/ptrace > Merging xen-two/linux-next > Merging xen-pvhvm/linux-next > Merging edac-amd/for-next > Merging percpu/for-next > CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h > Merging workqueues/for-next > Merging sfi/sfi-test > Merging asm-generic/next > Merging drivers-x86/linux-next > CONFLICT (content): Merge conflict in drivers/platform/x86/intel_pmic_gpio.c > Merging hwpoison/hwpoison > Merging sysctl/master > Merging driver-core/driver-core-next > Merging tty/tty-next > CONFLICT (content): Merge conflict in drivers/bluetooth/hci_ldisc.c > CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile > Merging usb/usb-next > CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-nuri.c > CONFLICT (content): Merge conflict in drivers/usb/host/isp1760-hcd.c > Merging staging/staging-next > CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_pci.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_pci.c left in tree. > CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_usb.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_usb.c left in tree. > $ git rm -f drivers/staging/rt2860/common/cmm_data_pci.c drivers/staging/rt2860/common/cmm_data_usb.c > Merging slabh/slabh > Merging bkl-config/config > Merging cleancache/linux-next > Merging scsi-post-merge/merge-base:master > Applying: powerpc: fix up mismerge in mmu_context_hash64.c ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: Tree for May 5 2011-05-07 3:24 ` linux-next: Tree for May 5 Jean-Christophe PLAGNIOL-VILLARD @ 2011-05-09 5:54 ` Stephen Rothwell 0 siblings, 0 replies; 10+ messages in thread From: Stephen Rothwell @ 2011-05-09 5:54 UTC (permalink / raw) To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: linux-next, LKML [-- Attachment #1: Type: text/plain, Size: 639 bytes --] Hi, On Sat, 7 May 2011 05:24:42 +0200 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > > on at91 at91sam9261ek_defconfig and at91sam9263ek_defconfig > > will not exist next merge window > > as we merge all 9263 and 9261 in > at91sam9263_defconfig and at91sam9261_defconfig > respectively > > for at91rm9200 there are all merged in at91rm9200_defconfig > in previous release > > so ecbat91_defconfig does not exist anymore Thanks for letting me know. I have updated our build system. -- 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] 10+ messages in thread
end of thread, other threads:[~2011-05-11 16:39 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-05-05 3:49 linux-next: Tree for May 5 Stephen Rothwell 2011-05-06 23:13 ` [PATCH -next] soc: fix wm8958-dsp2 printk format warnings Randy Dunlap 2011-05-08 14:01 ` Mark Brown 2011-05-08 15:38 ` Randy Dunlap 2011-05-08 16:06 ` Mark Brown 2011-05-08 16:48 ` [PATCH -next] ASoC: " Randy Dunlap 2011-05-11 14:05 ` Liam Girdwood 2011-05-11 16:16 ` Mark Brown 2011-05-07 3:24 ` linux-next: Tree for May 5 Jean-Christophe PLAGNIOL-VILLARD 2011-05-09 5:54 ` Stephen Rothwell
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.