* linux-next: Tree for December 15
@ 2008-12-15 15:06 Stephen Rothwell
2008-12-15 19:22 ` linux-next: Tree for December 15 (netlabel) Randy Dunlap
` (6 more replies)
0 siblings, 7 replies; 15+ messages in thread
From: Stephen Rothwell @ 2008-12-15 15:06 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 10690 bytes --]
Hi all,
Changes since 20081212:
New tree:
boot-params
Undropped tree:
mtd
staging
Dropped trees (temporarily):
v4l-dvb (build problem)
rr (difficult conflicts)
semaphore-removal (due to unfixed conflicts against Linus' tree)
cpu_alloc (build problem)
perfmon3 (concerns from the x86 team)
audit (difficult conflicts)
nommu (build problem)
boot-params (build problem)
The ftrace tree lost a conflict.
The device-mapper tree gained a conflict against the ftrace tree.
The net tree gained a conflict against the net-current tree.
The sound tree gained a conflict against the times tree and needed a
fixup patch for an interaction withe the timers tree.
The rr_cpumask tree gained a conflict against the sparseirq tree and 2
conflicts against the cpus4096 tree.
Th rr tree gained several difficult conflicts and was dropped.
The block tree gained a conflict against the ftrace tree.
The boot-params tree gained a conflict against each of the sparseirq,
parisc, arm and sh trees and gained a build problem, so was dropped.
I also applied "Define smp_call_function_many for UP" from Rusty Russell
and reverted 2 commits from the scsi tree due to build problems.
----------------------------------------------------------------------------
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,
44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) and
i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 133 trees (counting Linus' and 15 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
HEAD is now at 6c34bc2 Revert "radeonfb: accelerate imageblit and other improvements"
Merging origin/master
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-2.6.26
Merging audit-current/for-linus
Merging dwmw2/master
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
Merging s390/features
CONFLICT (content): Merge conflict in drivers/char/Makefile
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/mpc85xx_mds.c
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
CONFLICT (content): Merge conflict in scripts/recordmcount.pl
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in drivers/pci/pci-driver.c
Merging quilt/device-mapper
CONFLICT (content): Merge conflict in drivers/md/dm.c
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/xfs_rename.c
Merging infiniband/for-next
Merging acpi/test
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
CONFLICT (content): Merge conflict in arch/x86/kernel/reboot.c
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (delete/modify): arch/sparc64/kernel/idprom.c deleted in HEAD and modified in net/master. Version net/master of arch/sparc64/kernel/idprom.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/e1000e/ich8lan.c
CONFLICT (content): Merge conflict in fs/lockd/host.c
CONFLICT (content): Merge conflict in fs/lockd/mon.c
$ git rm -f arch/sparc64/kernel/idprom.c
Applying: net: async_tx merge fix
Merging mtd/master
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/corgi.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/poodle.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/spitz.c
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/drivers/pcsp/pcsp.c
Applying: sound: fixup for timers tree interaction
Merging cpufreq/next
Merging v9fs/for-next
Merging rr_cpumask/master
CONFLICT (content): Merge conflict in arch/x86/kernel/io_apic.c
CONFLICT (content): Merge conflict in kernel/sched.c
CONFLICT (content): Merge conflict in kernel/sched_stats.h
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/x86/kernel/io_apic.c
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
CONFLICT (content): Merge conflict in include/linux/cpumask.h
CONFLICT (content): Merge conflict in kernel/cpu.c
CONFLICT (content): Merge conflict in kernel/sched.c
CONFLICT (content): Merge conflict in kernel/sched_stats.h
$ git reset --hard
Merging cifs/master
CONFLICT (content): Merge conflict in fs/cifs/connect.c
Applying: cifs: update for new IP4/6 address printing
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging bkl-removal/bkl-removal
CONFLICT (content): Merge conflict in fs/ioctl.c
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/bio.c
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/net/tg3.c
CONFLICT (content): Merge conflict in firmware/Makefile
CONFLICT (content): Merge conflict in firmware/WHENCE
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 kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/mm/Makefile
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging generic-ipi/auto-generic-ipi-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
CONFLICT (content): Merge conflict in drivers/char/tty_audit.c
CONFLICT (content): Merge conflict in fs/cifs/cifs_fs_sb.h
CONFLICT (content): Merge conflict in fs/ocfs2/namei.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_cred.h
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_globals.h
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.h
Merging lblnet/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging quilt/ttydev
CONFLICT (content): Merge conflict in fs/devpts/inode.c
Merging agp/agp-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
Merging uwb/for-upstream
Merging watchdog/master
CONFLICT (content): Merge conflict in drivers/watchdog/iTCO_wdt.c
Merging proc/proc
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
CONFLICT (content): Merge conflict in kernel/sched.c
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging trivial/for-next
Merging audit/for-next
CONFLICT (content): Merge conflict in include/linux/audit.h
CONFLICT (content): Merge conflict in kernel/auditsc.c
CONFLICT (content): Merge conflict in kernel/capability.c
CONFLICT (content): Merge conflict in security/commoncap.c
$ git reset --hard
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/winbond/linux/wbusb.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/winbond/linux/wbusb.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211netdev.c
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211wext.c
$ git rm -f drivers/staging/winbond/linux/wbusb.c
Merging scsi-post-merge/master
Merging boot-params/master
CONFLICT (content): Merge conflict in arch/arm/kernel/setup.c
CONFLICT (content): Merge conflict in arch/parisc/kernel/setup.c
CONFLICT (content): Merge conflict in arch/sh/boards/mach-migor/setup.c
CONFLICT (content): Merge conflict in init/main.c
$ git reset --hard HEAD^
Applying: Define smp_call_function_many for UP
Created commit 65f3ebc: Revert "[SCSI] fcoe: Fibre Channel over Ethernet"
Created commit 15c07d6: Revert "[SCSI] libfc: A modular Fibre Channel library"
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: linux-next: Tree for December 15 (netlabel) 2008-12-15 15:06 linux-next: Tree for December 15 Stephen Rothwell @ 2008-12-15 19:22 ` Randy Dunlap 2008-12-15 21:35 ` Paul Moore 2008-12-15 19:26 ` linux-next: Tree for December 15 (mfd) Randy Dunlap ` (5 subsequent siblings) 6 siblings, 1 reply; 15+ messages in thread From: Randy Dunlap @ 2008-12-15 19:22 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, LKML, paul.moore, netdev netlabel_domainhash fails to build when IPV6 is not enabled: build-r7133.out:/local/linsrc/linux-next-20081215/net/netlabel/netlabel_domainhash.c:527: error: implicit declaration of function 'netlbl_af6list_foreach_rcu' build-r7133.out:/local/linsrc/linux-next-20081215/net/netlabel/netlabel_domainhash.c:528: error: expected ';' before 'goto' build-r7133.out:make[3]: *** [net/netlabel/netlabel_domainhash.o] Error 1 ~Randy ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for December 15 (netlabel) 2008-12-15 19:22 ` linux-next: Tree for December 15 (netlabel) Randy Dunlap @ 2008-12-15 21:35 ` Paul Moore 0 siblings, 0 replies; 15+ messages in thread From: Paul Moore @ 2008-12-15 21:35 UTC (permalink / raw) To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, netdev On Monday 15 December 2008 2:22:04 pm Randy Dunlap wrote: > netlabel_domainhash fails to build when IPV6 is not enabled: > > build-r7133.out:/local/linsrc/linux-next-20081215/net/netlabel/netlab >el_domainhash.c:527: error: implicit declaration of function > 'netlbl_af6list_foreach_rcu' > build-r7133.out:/local/linsrc/linux-next-20081215/net/netlabel/netlab >el_domainhash.c:528: error: expected ';' before 'goto' > build-r7133.out:make[3]: *** [net/netlabel/netlabel_domainhash.o] > Error 1 Thanks. I just fixed this and update the lblnet-2.6_next tree; it should be in tomorrow's next. -- paul moore linux @ hp ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for December 15 (mfd) 2008-12-15 15:06 linux-next: Tree for December 15 Stephen Rothwell 2008-12-15 19:22 ` linux-next: Tree for December 15 (netlabel) Randy Dunlap @ 2008-12-15 19:26 ` Randy Dunlap 2008-12-17 19:43 ` Randy Dunlap 2008-12-15 23:27 ` linux-next: Tree for December 15 (MTD) Randy Dunlap ` (4 subsequent siblings) 6 siblings, 1 reply; 15+ messages in thread From: Randy Dunlap @ 2008-12-15 19:26 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, LKML, sameo Lots of mfd build failures like this: build-r7123.out:/local/linsrc/linux-next-20081215/drivers/mfd/twl4030-irq.c:183: error: 'irq_desc' undeclared (first use in this function) build-r7123.out:/local/linsrc/linux-next-20081215/drivers/mfd/twl4030-irq.c:455: error: 'irq_desc' undeclared (first use in this function) build-r7123.out:/local/linsrc/linux-next-20081215/drivers/mfd/twl4030-irq.c:515: error: 'irq_desc' undeclared (first use in this function) build-r7123.out:make[3]: *** [drivers/mfd/twl4030-irq.o] Error 1 ~Randy ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for December 15 (mfd) 2008-12-15 19:26 ` linux-next: Tree for December 15 (mfd) Randy Dunlap @ 2008-12-17 19:43 ` Randy Dunlap 2008-12-18 9:45 ` Samuel Ortiz 2008-12-18 10:57 ` Samuel Ortiz 0 siblings, 2 replies; 15+ messages in thread From: Randy Dunlap @ 2008-12-17 19:43 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, LKML, sameo On Mon, 15 Dec 2008 11:26:34 -0800 Randy Dunlap wrote: > Lots of mfd build failures like this: > > > build-r7123.out:/local/linsrc/linux-next-20081215/drivers/mfd/twl4030-irq.c:183: error: 'irq_desc' undeclared (first use in this function) > build-r7123.out:/local/linsrc/linux-next-20081215/drivers/mfd/twl4030-irq.c:455: error: 'irq_desc' undeclared (first use in this function) > build-r7123.out:/local/linsrc/linux-next-20081215/drivers/mfd/twl4030-irq.c:515: error: 'irq_desc' undeclared (first use in this function) > build-r7123.out:make[3]: *** [drivers/mfd/twl4030-irq.o] Error 1 This build error still happens in linux-next-20081217. It only occurs when I2C=y (see drivers/mfd/Kconfig). Stephen, doing an allyesconfig i386 or x86_64 build will catch this, then you can drop the mfd tree and hopefully prod someone into fixing this... --- ~Randy ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for December 15 (mfd) 2008-12-17 19:43 ` Randy Dunlap @ 2008-12-18 9:45 ` Samuel Ortiz 2008-12-18 10:57 ` Samuel Ortiz 1 sibling, 0 replies; 15+ messages in thread From: Samuel Ortiz @ 2008-12-18 9:45 UTC (permalink / raw) To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML On Wed, Dec 17, 2008 at 11:43:00AM -0800, Randy Dunlap wrote: > On Mon, 15 Dec 2008 11:26:34 -0800 Randy Dunlap wrote: > > > Lots of mfd build failures like this: > > > > > > build-r7123.out:/local/linsrc/linux-next-20081215/drivers/mfd/twl4030-irq.c:183: error: 'irq_desc' undeclared (first use in this function) > > build-r7123.out:/local/linsrc/linux-next-20081215/drivers/mfd/twl4030-irq.c:455: error: 'irq_desc' undeclared (first use in this function) > > build-r7123.out:/local/linsrc/linux-next-20081215/drivers/mfd/twl4030-irq.c:515: error: 'irq_desc' undeclared (first use in this function) > > build-r7123.out:make[3]: *** [drivers/mfd/twl4030-irq.o] Error 1 > > > This build error still happens in linux-next-20081217. > > It only occurs when I2C=y (see drivers/mfd/Kconfig). > > Stephen, doing an allyesconfig i386 or x86_64 build will catch this, > then you can drop the mfd tree and hopefully prod someone into fixing this... Sorry for the delay, I was away from the interweb for the last 2 days. I'll look into it. Cheers, Samuel. > --- > ~Randy -- Intel Open Source Technology Centre http://oss.intel.com/ ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for December 15 (mfd) 2008-12-17 19:43 ` Randy Dunlap 2008-12-18 9:45 ` Samuel Ortiz @ 2008-12-18 10:57 ` Samuel Ortiz 2008-12-18 11:02 ` David Brownell 1 sibling, 1 reply; 15+ messages in thread From: Samuel Ortiz @ 2008-12-18 10:57 UTC (permalink / raw) To: Randy Dunlap, David Brownell; +Cc: Stephen Rothwell, linux-next, LKML On Wed, Dec 17, 2008 at 11:43:00AM -0800, Randy Dunlap wrote: > On Mon, 15 Dec 2008 11:26:34 -0800 Randy Dunlap wrote: > > > Lots of mfd build failures like this: > > > > > > build-r7123.out:/local/linsrc/linux-next-20081215/drivers/mfd/twl4030-irq.c:183: error: 'irq_desc' undeclared (first use in this function) > > build-r7123.out:/local/linsrc/linux-next-20081215/drivers/mfd/twl4030-irq.c:455: error: 'irq_desc' undeclared (first use in this function) > > build-r7123.out:/local/linsrc/linux-next-20081215/drivers/mfd/twl4030-irq.c:515: error: 'irq_desc' undeclared (first use in this function) > > build-r7123.out:make[3]: *** [drivers/mfd/twl4030-irq.o] Error 1 > > > This build error still happens in linux-next-20081217. It should be fixed with the latest mfd tree. David, are you ok with this fix: http://git.o-hand.com/cgit.cgi/linux-mfd/commit/?h=for-next&id=1e6b6a411fd4f6f99e4d9f003946823007e3c34f Cheers, Samuel. > It only occurs when I2C=y (see drivers/mfd/Kconfig). > > Stephen, doing an allyesconfig i386 or x86_64 build will catch this, > then you can drop the mfd tree and hopefully prod someone into fixing this... > > --- > ~Randy -- Intel Open Source Technology Centre http://oss.intel.com/ ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for December 15 (mfd) 2008-12-18 10:57 ` Samuel Ortiz @ 2008-12-18 11:02 ` David Brownell 0 siblings, 0 replies; 15+ messages in thread From: David Brownell @ 2008-12-18 11:02 UTC (permalink / raw) To: Samuel Ortiz; +Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML On Thursday 18 December 2008, Samuel Ortiz wrote: > David, are you ok with this fix: > http://git.o-hand.com/cgit.cgi/linux-mfd/commit/?h=for-next&id=1e6b6a411fd4f6f99e4d9f003946823007e3c34f I'd rather remove that "if (can't happen) { pr_err, return }" code myself ... otherwise, sure. - Dave ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for December 15 (MTD) 2008-12-15 15:06 linux-next: Tree for December 15 Stephen Rothwell 2008-12-15 19:22 ` linux-next: Tree for December 15 (netlabel) Randy Dunlap 2008-12-15 19:26 ` linux-next: Tree for December 15 (mfd) Randy Dunlap @ 2008-12-15 23:27 ` Randy Dunlap 2008-12-15 23:33 ` [PATCH -next] mtd: fix dataflash printk formats Randy Dunlap ` (3 subsequent siblings) 6 siblings, 0 replies; 15+ messages in thread From: Randy Dunlap @ 2008-12-15 23:27 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, LKML, David Woodhouse, linux-mtd Stephen Rothwell wrote: > Hi all, > > Changes since 20081212: > > New tree: > boot-params > > Undropped tree: > mtd On i386 builds, I'm seeing build-r7137.out:mtd_dataflash.c:(.text+0x10dff4): undefined reference to `__umoddi3' build-r7137.out:mtd_dataflash.c:(.text+0x10e010): undefined reference to `__umoddi3' build-r7137.out:mtd_dataflash.c:(.text+0x10e09f): undefined reference to `__udivdi3' which are caused by % and / operations where the denominator is a variable: /* Sanity checks */ if ((instr->addr + instr->len) > mtd->size || (instr->len % priv->page_size) != 0 || (instr->addr % priv->page_size) != 0) return -EINVAL; ... /* Calculate flash page address; use block erase (for speed) if * we're at a block boundary and need to erase the whole block. */ pageaddr = instr->addr / priv->page_size; ~Randy ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH -next] mtd: fix dataflash printk formats 2008-12-15 15:06 linux-next: Tree for December 15 Stephen Rothwell ` (2 preceding siblings ...) 2008-12-15 23:27 ` linux-next: Tree for December 15 (MTD) Randy Dunlap @ 2008-12-15 23:33 ` Randy Dunlap 2008-12-15 23:36 ` [PATCH -next] mtd: fix m25p80 " Randy Dunlap ` (2 subsequent siblings) 6 siblings, 0 replies; 15+ messages in thread From: Randy Dunlap @ 2008-12-15 23:33 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, LKML, David Woodhouse, linux-mtd, akpm From: Randy Dunlap <randy.dunlap@oracle•com> Fix printk format warnings: build-r7137.out:/local/linsrc/linux-next-20081215/drivers/mtd/devices/mtd_dataflash.c:156: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'uint64_t' build-r7137.out:/local/linsrc/linux-next-20081215/drivers/mtd/devices/mtd_dataflash.c:156: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'uint64_t' build-r7137.out:/local/linsrc/linux-next-20081215/drivers/mtd/devices/mtd_dataflash.c:670: warning: format '%d' expects type 'int', but argument 5 has type 'uint64_t' Signed-off-by: Randy Dunlap <randy.dunlap@oracle•com> --- drivers/mtd/devices/mtd_dataflash.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- linux-next-20081215.orig/drivers/mtd/devices/mtd_dataflash.c +++ linux-next-20081215/drivers/mtd/devices/mtd_dataflash.c @@ -153,9 +153,10 @@ static int dataflash_erase(struct mtd_in unsigned blocksize = priv->page_size << 3; uint8_t *command; - DEBUG(MTD_DEBUG_LEVEL2, "%s: erase addr=0x%x len 0x%x\n", + DEBUG(MTD_DEBUG_LEVEL2, "%s: erase addr=0x%llx len 0x%llx\n", dev_name(&spi->dev), - instr->addr, instr->len); + (unsigned long long)instr->addr, + (unsigned long long)instr->len); /* Sanity checks */ if ((instr->addr + instr->len) > mtd->size @@ -667,8 +668,8 @@ add_dataflash_otp(struct spi_device *spi if (revision >= 'c') otp_tag = otp_setup(device, revision); - dev_info(&spi->dev, "%s (%d KBytes) pagesize %d bytes%s\n", - name, DIV_ROUND_UP(device->size, 1024), + dev_info(&spi->dev, "%s (%llu KBytes) pagesize %d bytes%s\n", + name, (unsigned long long)DIV_ROUND_UP(device->size, 1024), pagesize, otp_tag); dev_set_drvdata(&spi->dev, priv); ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH -next] mtd: fix m25p80 printk formats 2008-12-15 15:06 linux-next: Tree for December 15 Stephen Rothwell ` (3 preceding siblings ...) 2008-12-15 23:33 ` [PATCH -next] mtd: fix dataflash printk formats Randy Dunlap @ 2008-12-15 23:36 ` Randy Dunlap 2008-12-15 23:37 ` [PATCH -next] mtd: fix nandsim sched.h references Randy Dunlap 2008-12-15 23:38 ` [PATCH -next] mtd: fix nettel printk formats Randy Dunlap 6 siblings, 0 replies; 15+ messages in thread From: Randy Dunlap @ 2008-12-15 23:36 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, LKML, David Woodhouse, linux-mtd, akpm From: Randy Dunlap <randy.dunlap@oracle•com> Fix printk format warnings: build-r7150.out:/local/linsrc/linux-next-20081215/drivers/mtd/devices/m25p80.c:172: warning: format '%d' expects type 'int', but argument 4 has type 'uint64_t' build-r7150.out:/local/linsrc/linux-next-20081215/drivers/mtd/devices/m25p80.c:236: warning: format '%d' expects type 'int', but argument 6 has type 'uint64_t' build-r7150.out:/local/linsrc/linux-next-20081215/drivers/mtd/devices/m25p80.c:680: warning: format '%d' expects type 'int', but argument 5 has type 'uint64_t' build-r7150.out:/local/linsrc/linux-next-20081215/drivers/mtd/devices/m25p80.c:683: warning: format '%.8x' expects type 'unsigned int', but argument 3 has type 'uint64_t' build-r7150.out:/local/linsrc/linux-next-20081215/drivers/mtd/devices/m25p80.c:683: warning: format '%u' expects type 'unsigned int', but argument 4 has type 'uint64_t' build-r7150.out:/local/linsrc/linux-next-20081215/drivers/mtd/devices/m25p80.c:693: warning: format '%.8x' expects type 'unsigned int', but argument 3 has type 'uint64_t' build-r7150.out:/local/linsrc/linux-next-20081215/drivers/mtd/devices/m25p80.c:724: warning: format '%.8x' expects type 'unsigned int', but argument 4 has type 'uint64_t' build-r7150.out:/local/linsrc/linux-next-20081215/drivers/mtd/devices/m25p80.c:724: warning: format '%.8x' expects type 'unsigned int', but argument 5 has type 'uint64_t' build-r7150.out:/local/linsrc/linux-next-20081215/drivers/mtd/devices/m25p80.c:724: warning: format '%u' expects type 'unsigned int', but argument 6 has type 'uint64_t' Signed-off-by: Randy Dunlap <randy.dunlap@oracle•com> --- drivers/mtd/devices/m25p80.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) --- linux-next-20081215.orig/drivers/mtd/devices/m25p80.c +++ linux-next-20081215/drivers/mtd/devices/m25p80.c @@ -169,9 +169,9 @@ static int wait_till_ready(struct m25p * */ static int erase_chip(struct m25p *flash) { - DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB\n", + DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %lluKiB\n", dev_name(&flash->spi->dev), __func__, - flash->mtd.size / 1024); + (unsigned long long)flash->mtd.size / 1024); /* Wait until finished previous write command. */ if (wait_till_ready(flash)) @@ -233,9 +233,9 @@ static int m25p80_erase(struct mtd_info struct m25p *flash = mtd_to_m25p(mtd); u32 addr,len; - DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %d\n", + DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %u\n", dev_name(&flash->spi->dev), __func__, "at", - (u32)instr->addr, instr->len); + (u32)instr->addr, (u32)instr->len); /* sanity checks */ if (instr->addr + instr->len > flash->mtd.size) @@ -677,24 +677,26 @@ static int __devinit m25p_probe(struct s flash->mtd.erasesize = info->sector_size; } - dev_info(&spi->dev, "%s (%d Kbytes)\n", info->name, - flash->mtd.size / 1024); + dev_info(&spi->dev, "%s (%llu Kbytes)\n", info->name, + (unsigned long long)flash->mtd.size / 1024); DEBUG(MTD_DEBUG_LEVEL2, - "mtd .name = %s, .size = 0x%.8x (%uMiB) " + "mtd .name = %s, .size = 0x%.8llx (%lluMiB) " ".erasesize = 0x%.8x (%uKiB) .numeraseregions = %d\n", flash->mtd.name, - flash->mtd.size, flash->mtd.size / (1024*1024), + (unsigned long long)flash->mtd.size, + (unsigned long long)flash->mtd.size / (1024*1024), flash->mtd.erasesize, flash->mtd.erasesize / 1024, flash->mtd.numeraseregions); if (flash->mtd.numeraseregions) for (i = 0; i < flash->mtd.numeraseregions; i++) DEBUG(MTD_DEBUG_LEVEL2, - "mtd.eraseregions[%d] = { .offset = 0x%.8x, " + "mtd.eraseregions[%d] = { .offset = 0x%.8llx, " ".erasesize = 0x%.8x (%uKiB), " - ".numblocks = %d }\n", - i, flash->mtd.eraseregions[i].offset, + ".numblocks = %d }\n", i, + (unsigned long long) + flash->mtd.eraseregions[i].offset, flash->mtd.eraseregions[i].erasesize, flash->mtd.eraseregions[i].erasesize / 1024, flash->mtd.eraseregions[i].numblocks); @@ -722,12 +724,12 @@ static int __devinit m25p_probe(struct s if (nr_parts > 0) { for (i = 0; i < nr_parts; i++) { DEBUG(MTD_DEBUG_LEVEL2, "partitions[%d] = " - "{.name = %s, .offset = 0x%.8x, " - ".size = 0x%.8x (%uKiB) }\n", + "{.name = %s, .offset = 0x%.8llx, " + ".size = 0x%.8llx (%lluKiB) }\n", i, parts[i].name, - parts[i].offset, - parts[i].size, - parts[i].size / 1024); + (unsigned long long)parts[i].offset, + (unsigned long long)parts[i].size, + (unsigned long long)(parts[i].size / 1024)); } flash->partitioned = 1; return add_mtd_partitions(&flash->mtd, parts, nr_parts); ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH -next] mtd: fix nandsim sched.h references 2008-12-15 15:06 linux-next: Tree for December 15 Stephen Rothwell ` (4 preceding siblings ...) 2008-12-15 23:36 ` [PATCH -next] mtd: fix m25p80 " Randy Dunlap @ 2008-12-15 23:37 ` Randy Dunlap 2008-12-15 23:38 ` [PATCH -next] mtd: fix nettel printk formats Randy Dunlap 6 siblings, 0 replies; 15+ messages in thread From: Randy Dunlap @ 2008-12-15 23:37 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, LKML, David Woodhouse, linux-mtd, akpm From: Randy Dunlap <randy.dunlap@oracle•com> Fix sched.h references: build-r7149.out:/local/linsrc/linux-next-20081215/drivers/mtd/nand/nandsim.c:1326: error: dereferencing pointer to incomplete type build-r7149.out:/local/linsrc/linux-next-20081215/drivers/mtd/nand/nandsim.c:1326: error: 'PF_MEMALLOC' undeclared (first use in this function) build-r7149.out:/local/linsrc/linux-next-20081215/drivers/mtd/nand/nandsim.c:1328: error: dereferencing pointer to incomplete type build-r7149.out:/local/linsrc/linux-next-20081215/drivers/mtd/nand/nandsim.c:1335: error: dereferencing pointer to incomplete type build-r7149.out:/local/linsrc/linux-next-20081215/drivers/mtd/nand/nandsim.c:1335: error: 'PF_MEMALLOC' undeclared (first use in this function) build-r7149.out:make[4]: *** [drivers/mtd/nand/nandsim.o] Error 1 Signed-off-by: Randy Dunlap <randy.dunlap@oracle•com> --- drivers/mtd/nand/nandsim.c | 1 + 1 file changed, 1 insertion(+) --- linux-next-20081215.orig/drivers/mtd/nand/nandsim.c +++ linux-next-20081215/drivers/mtd/nand/nandsim.c @@ -38,6 +38,7 @@ #include <linux/delay.h> #include <linux/list.h> #include <linux/random.h> +#include <linux/sched.h> #include <linux/fs.h> #include <linux/pagemap.h> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH -next] mtd: fix nettel printk formats 2008-12-15 15:06 linux-next: Tree for December 15 Stephen Rothwell ` (5 preceding siblings ...) 2008-12-15 23:37 ` [PATCH -next] mtd: fix nandsim sched.h references Randy Dunlap @ 2008-12-15 23:38 ` Randy Dunlap 6 siblings, 0 replies; 15+ messages in thread From: Randy Dunlap @ 2008-12-15 23:38 UTC (permalink / raw) To: Stephen Rothwell; +Cc: linux-next, LKML, David Woodhouse, linux-mtd, akpm From: Randy Dunlap <randy.dunlap@oracle•com> Fix printk format references: drivers/mtd/maps/nettel.c:361: warning: format '%d' expects type 'int', but argument 2 has type 'uint64_t' Signed-off-by: Randy Dunlap <randy.dunlap@oracle•com> --- drivers/mtd/maps/nettel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- linux-next-20081215.orig/drivers/mtd/maps/nettel.c +++ linux-next-20081215/drivers/mtd/maps/nettel.c @@ -357,8 +357,8 @@ static int __init nettel_init(void) *intel1par = 0; } - printk(KERN_NOTICE "SNAPGEAR: Intel flash device size = %dK\n", - (intel_mtd->size >> 10)); + printk(KERN_NOTICE "SNAPGEAR: Intel flash device size = %lluK\n", + (unsigned long long)(intel_mtd->size >> 10)); intel_mtd->owner = THIS_MODULE; ^ permalink raw reply [flat|nested] 15+ messages in thread
* linux-next: Tree for December 15 @ 2009-12-15 5:53 Stephen Rothwell 0 siblings, 0 replies; 15+ messages in thread From: Stephen Rothwell @ 2009-12-15 5:53 UTC (permalink / raw) To: linux-next; +Cc: LKML [-- Attachment #1: Type: text/plain, Size: 10859 bytes --] Hi all, My usual call for calm: please do not put stuff destined for 2.6.34 into linux-next trees until after 2.6.33-rc1. Changes since 20091214: Since Linus is now merging trees into his, various conflicts move from tree to tree. The origin tree gained a build failure for which I applied a patch. The md-current tree lost its conflict. The mips tree gained a conflict against Linus' tree. The 52xx-and-virtex lost its build failure but gained a conflict against Linus' tree. The acpi tree still has its build failure so I used the version from next-20091211. The voltage tree gained 2 conflicts against Linus' tree - one requiring a fixup and the other requiring a rollback of the voltage tree to the version in next-20091120. The devicetree tree lost its build failure. The limits tree lost three conflicts. The tip tree lost its conflict. The percpu tree lost its conflicts. ---------------------------------------------------------------------------- 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 155 trees (counting Linus' and 22 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do. Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Jan Dittmer for adding the linux-next tree to his build tests at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy Dunlap for doing many randconfig builds. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwell sfr@canb•auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master Merging fixes/fixes Merging arm-current/master Merging m68k-current/for-linus Merging powerpc-merge/merge Merging sparc-current/master Merging scsi-rc-fixes/master Merging net-current/master Merging sound-current/for-linus Merging pci-current/for-linus Merging wireless-current/master Merging kbuild-current/for-linus Merging quilt/driver-core.current Merging quilt/tty.current Merging quilt/usb.current Merging quilt/staging.current Merging cpufreq-current/fixes Merging input-current/for-linus Merging md-current/for-linus Merging audit-current/for-linus Merging crypto-current/master Merging ide-curent/master Merging dwmw2/master Merging arm/devel Merging davinci/davinci-next Merging msm/for-next Merging omap/for-next Merging pxa/for-next Merging samsung/next-samsung Merging avr32/avr32-arch CONFLICT (content): Merge conflict in arch/avr32/mach-at32ap/include/mach/cpu.h Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next Merging m68knommu/for-next CONFLICT (content): Merge conflict in arch/m68k/include/asm/ptrace.h Merging microblaze/next CONFLICT (content): Merge conflict in scripts/recordmcount.pl Merging mips/mips-for-linux-next CONFLICT (content): Merge conflict in arch/mips/Kconfig CONFLICT (content): Merge conflict in arch/mips/Makefile CONFLICT (content): Merge conflict in arch/mips/include/asm/ftrace.h CONFLICT (add/add): Merge conflict in arch/mips/kernel/ftrace.c CONFLICT (add/add): Merge conflict in arch/mips/kernel/mcount.S CONFLICT (content): Merge conflict in drivers/pcmcia/Makefile CONFLICT (content): Merge conflict in scripts/recordmcount.pl Merging parisc/next Merging powerpc/next Merging 4xx/next Merging 52xx-and-virtex/next CONFLICT (content): Merge conflict in arch/powerpc/mm/fsl_booke_mmu.c Merging galak/next Merging s390/features Merging sh/master Merging sparc/master Merging xtensa/master Merging ceph/for-next Merging cifs/master Merging configfs/linux-next Merging ecryptfs/next Merging ext3/for_next Merging ext4/next Merging fatfs/master Merging fuse/for-next Merging gfs2/master Merging jfs/next Merging logfs/master Merging nfs/linux-next Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Merging squashfs/master Merging udf/for_next Merging v9fs/for-next CONFLICT (add/add): Merge conflict in fs/9p/cache.c 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 bjdooks-i2c/next-i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging v4l-dvb/master Merging kbuild/for-next Merging kconfig/for-next Merging ide/master Merging libata/NEXT Merging infiniband/for-next Merging acpi/test CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in include/acpi/processor.h $ git reset --hard HEAD^ Merging refs/next/20091211/acpi CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in include/acpi/processor.h Merging ieee1394/for-next CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv-1394.c CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv-avc.c CONFLICT (add/add): Merge conflict in drivers/media/dvb/firewire/firedtv-fw.c CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv.h Merging ubi/linux-next Merging kvm/linux-next Merging dlm/next Merging scsi/master Merging async_tx/next Merging net/master Merging wireless/master Merging mtd/master CONFLICT (content): Merge conflict in drivers/mtd/devices/m25p80.c CONFLICT (content): Merge conflict in drivers/mtd/maps/pcmciamtd.c CONFLICT (delete/modify): drivers/mtd/nand/excite_nandflash.c deleted in HEAD and modified in mtd/master. Version mtd/master of drivers/mtd/nand/excite_nandflash.c left in tree. CONFLICT (content): Merge conflict in drivers/mtd/nand/pxa3xx_nand.c CONFLICT (content): Merge conflict in kernel/printk.c $ git rm -f drivers/mtd/nand/excite_nandflash.c Merging crypto/master Merging sound/for-next Merging cpufreq/next Merging quilt/rr Applying: modpost: autoconf.h has moved to include/generated Applying: rr: cpufreq: fix up for api name change Merging mmc/next Merging tmio-mmc/linux-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 CONFLICT (content): Merge conflict in drivers/platform/x86/thinkpad_acpi.c 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 CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_fb_helper.c Merging voltage/for-next CONFLICT (rename/modify): Merge conflict in drivers/regulator/twl-regulator.c CONFLICT (content): Merge conflict in drivers/mfd/Kconfig CONFLICT (content): Merge conflict in drivers/mfd/Makefile CONFLICT (content): Merge conflict in drivers/regulator/Makefile $ git reset --hard Merging refs/next/20091120/voltage CONFLICT (content): Merge conflict in drivers/mfd/Kconfig CONFLICT (content): Merge conflict in drivers/mfd/Makefile CONFLICT (content): Merge conflict in drivers/regulator/Makefile Merging security-testing/next Merging lblnet/master Merging agp/agp-next Merging uwb/for-upstream Merging watchdog/master Merging bdev/master Merging dwmw2-iommu/master Merging cputime/cputime Merging osd/linux-next Merging jc_docs/docs-next Merging nommu/master Merging trivial/for-next Merging audit/for-next Merging quilt/aoe Merging suspend/linux-next Merging bluetooth/master Merging fsnotify/for-next CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S CONFLICT (content): Merge conflict in fs/afs/write.c CONFLICT (content): Merge conflict in fs/cifs/dir.c CONFLICT (content): Merge conflict in fs/ubifs/file.c CONFLICT (content): Merge conflict in include/asm-generic/fcntl.h CONFLICT (content): Merge conflict in include/net/compat.h CONFLICT (content): Merge conflict in net/compat.c CONFLICT (content): Merge conflict in net/socket.c Merging irda/for-next CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c Merging hwlat/for-linus CONFLICT (content): Merge conflict in drivers/misc/Makefile Merging drbd/for-jens Merging catalin/for-next Merging alacrity/linux-next CONFLICT (content): Merge conflict in include/linux/Kbuild CONFLICT (content): Merge conflict in lib/Kconfig Merging i7core_edac/linux_next Merging devicetree/next-devicetree Merging spi/next-spi Merging limits/writable_limits CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S Merging omap_dss2/for-next Merging tip/auto-latest Merging edac-amd/for-next Merging oprofile/for-next Merging percpu/for-next Merging workqueues/for-next Merging sfi/sfi-test Merging asm-generic/next Merging hwpoison/hwpoison CONFLICT (content): Merge conflict in MAINTAINERS Merging sysctl/master Merging quilt/driver-core Merging quilt/tty Merging quilt/usb Merging quilt/staging Merging scsi-post-merge/master Applying: mfd: fix for twl4030 renaming [-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* linux-next: Tree for December 15 @ 2010-12-15 4:03 Stephen Rothwell 0 siblings, 0 replies; 15+ messages in thread From: Stephen Rothwell @ 2010-12-15 4:03 UTC (permalink / raw) To: linux-next; +Cc: LKML [-- Attachment #1: Type: text/plain, Size: 9743 bytes --] Hi all, Changes since 20101214: New tree: linux-spec The arm tree gained a conflict against the arm-current tree. The ceph tree gained a conflict against Linus' tree. The net tree gained a conflict against the net-current tree. The voltage tree lost its build failure but gained another so I used the version from next-20101213. ---------------------------------------------------------------------------- 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 183 trees (counting Linus' and 26 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 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/rc-fixes 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 gcl-current/merge Merging arm/devel CONFLICT (content): Merge conflict in arch/arm/Kconfig 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 avr32/avr32-arch Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next Merging m68knommu/for-next Merging microblaze/next Merging mips/mips-for-linux-next Merging parisc/next Merging powerpc/next Merging 4xx/next Merging 52xx-and-virtex/next Merging galak/next Merging s390/features Merging sh/sh-latest Merging rmobile/rmobile-latest CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig Applying: rmobile: merge fixup for clkdev changes Merging sparc/master Merging tile/master Merging xtensa/master CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig Merging ceph/for-next CONFLICT (content): Merge conflict in fs/ceph/mds_client.c 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 CONFLICT (content): Merge conflict in fs/fuse/inode.c 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 Merging quilt/kernel-doc Merging v4l-dvb/master 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 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/bnx2x/bnx2x.h CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-1000.c CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-6000.c CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.h CONFLICT (content): Merge conflict in drivers/vhost/vhost.c CONFLICT (content): Merge conflict in net/9p/protocol.c Merging wireless/master Merging bluetooth/master CONFLICT (content): Merge conflict in net/bluetooth/Makefile Merging mtd/master Merging crypto/master Merging sound/for-next Merging sound-asoc/for-next Merging cpufreq/next Merging quilt/rr Merging input/next CONFLICT (content): Merge conflict in include/linux/input.h 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 drivers/mfd/wm8994-core.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 CONFLICT (content): Merge conflict in drivers/regulator/core.c CONFLICT (content): Merge conflict in drivers/regulator/mc13783-regulator.c $ git reset --hard HEAD^ Merging refs/next/20101213/voltage CONFLICT (content): Merge conflict in drivers/regulator/core.c [master a69e63f] Merge commit 'refs/next/20101213/voltage' 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 arch/arm/mach-omap2/pm24xx.c CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.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/next-devicetree Merging spi/next-spi Merging tip/auto-latest Merging rcu/rcu/next Merging oprofile/for-next Merging xen/upstream/xen Merging swiotlb-xen/master CONFLICT (content): Merge conflict in drivers/xen/Kconfig CONFLICT (content): Merge conflict in drivers/xen/Makefile Merging xen-pvhvm/linux-next Merging edac-amd/for-next Merging percpu/for-next CONFLICT (delete/modify): arch/x86/kernel/apic/nmi.c deleted in HEAD and modified in percpu/for-next. Version percpu/for-next of arch/x86/kernel/apic/nmi.c left in tree. $ git rm -f arch/x86/kernel/apic/nmi.c Merging workqueues/for-next CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Merging sfi/sfi-test Merging asm-generic/next Merging drivers-x86/linux-next Merging hwpoison/hwpoison Merging sysctl/master Merging driver-core/driver-core-next Merging tty/tty-next Merging usb/usb-next CONFLICT (content): Merge conflict in arch/sh/Kconfig CONFLICT (content): Merge conflict in drivers/usb/musb/blackfin.c Merging staging/staging-next 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 include/linux/hardirq.h CONFLICT (content): Merge conflict in include/linux/smp_lock.h Merging irqflags/master 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 [-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2010-12-15 4:03 UTC | newest] Thread overview: 15+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-12-15 15:06 linux-next: Tree for December 15 Stephen Rothwell 2008-12-15 19:22 ` linux-next: Tree for December 15 (netlabel) Randy Dunlap 2008-12-15 21:35 ` Paul Moore 2008-12-15 19:26 ` linux-next: Tree for December 15 (mfd) Randy Dunlap 2008-12-17 19:43 ` Randy Dunlap 2008-12-18 9:45 ` Samuel Ortiz 2008-12-18 10:57 ` Samuel Ortiz 2008-12-18 11:02 ` David Brownell 2008-12-15 23:27 ` linux-next: Tree for December 15 (MTD) Randy Dunlap 2008-12-15 23:33 ` [PATCH -next] mtd: fix dataflash printk formats Randy Dunlap 2008-12-15 23:36 ` [PATCH -next] mtd: fix m25p80 " Randy Dunlap 2008-12-15 23:37 ` [PATCH -next] mtd: fix nandsim sched.h references Randy Dunlap 2008-12-15 23:38 ` [PATCH -next] mtd: fix nettel printk formats Randy Dunlap -- strict thread matches above, loose matches on Subject: below -- 2009-12-15 5:53 linux-next: Tree for December 15 Stephen Rothwell 2010-12-15 4:03 Stephen Rothwell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox