* linux-next: Tree for September 16
@ 2008-09-16 7:34 Stephen Rothwell
2008-09-16 18:00 ` Takashi Iwai
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Stephen Rothwell @ 2008-09-16 7:34 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 15068 bytes --]
Hi all,
News: I have added a file (Next/SHA1s) that contains the SHA1 of the head
of each merged tree. Hopefully people will find it useful.
Changes since next-20080913:
New trees: scsi-post-merge and bdev (these are both rebased onto the end
of linux-next as they depend on some constituent trees).
The pxa tree gained a conflict against Linus' tree.
The x86 tree lost two conflicts.
The tip-core tree lost a build fix patch.
The kvm tree gained a conflict against the x86 tree.
The block tree gained a build fix patch.
The sparseirq tree gained a conflict against each of the kvm tree and the
x86 tree.
I have also applied the following patches for known problems:
sparc: qlogicpti fallout from sbus removal
fix IXGBE dependencies
linux-next: net tree build failure (depca)
linux-next: 3c509 build fix
----------------------------------------------------------------------------
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, it is also built with powerpc allnoconfig,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 116 trees (counting Linus' and 14 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 powerpc-merge/merge
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sparc-current/master
Merging sound-current/for-linus
Merging arm-current/master
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 dwmw2/master
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging quilt/m68k
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
CONFLICT (rename/delete): Renamed include/asm-parisc/a.out.h->arch/parisc/include/asm/a.out.h in parisc/master and deleted in HEAD
$ git rm -f arch/parisc/include/asm/a.out.h
Merging powerpc/powerpc-next
Merging 4xx/next
Merging galak/powerpc-next
Merging pxa/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/corgi.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/spitz.c
CONFLICT (content): Merge conflict in drivers/spi/pxa2xx_spi.c
Applying pxa: LCD_CORGI is currently BROKEN
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in include/asm-x86/statfs.h
Applying x86: fix arch/x86/kernel/k8.c
Merging xtensa/master
Merging quilt/driver-core
Applying driver-core: atmel_cs.c fixup
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
CONFLICT (content): Merge conflict in include/asm-x86/smp.h
Merging ftrace/auto-ftrace-next
CONFLICT (content): Merge conflict in kernel/module.c
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
CONFLICT (content): Merge conflict in include/asm-x86/pda.h
CONFLICT (content): Merge conflict in kernel/fork.c
Merging timers/auto-timers-next
CONFLICT (delete/modify): arch/x86/kernel/apic_64.c deleted in timers/auto-timers-next and modified in HEAD. Version HEAD of arch/x86/kernel/apic_64.c left in tree.
CONFLICT (content): Merge conflict in arch/x86/xen/spinlock.c
CONFLICT (content): Merge conflict in drivers/pci/probe.c
CONFLICT (content): Merge conflict in include/linux/pci_ids.h
$ git rm arch/x86/kernel/apic_64.c
Merging pci/linux-next
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in drivers/pci/probe.c
Merging quilt/device-mapper
Merging hid/mm
CONFLICT (content): Merge conflict in drivers/hid/usbhid/hid-core.c
Applying HID: fix for warn() removal
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/stable
CONFLICT (content): Merge conflict in drivers/media/video/Kconfig
CONFLICT (content): Merge conflict in drivers/media/video/zr364xx.c
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
CONFLICT (content): Merge conflict in drivers/ide/pci/hpt366.c
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in drivers/misc/acer-wmi.c
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
CONFLICT (content): Merge conflict in arch/x86/kvm/i8254.c
CONFLICT (content): Merge conflict in include/asm-x86/kvm.h
CONFLICT (content): Merge conflict in include/asm-x86/msr-index.h
Merging dlm/next
Merging scsi/master
Merging tests/master
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
CONFLICT (content): Merge conflict in kernel/module.c
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging semaphore-removal/semaphore-removal
Merging bkl-removal/bkl-removal
Merging trivial/next
CONFLICT (content): Merge conflict in Documentation/edac.txt
CONFLICT (content): Merge conflict in include/linux/securebits.h
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in drivers/base/class.c
CONFLICT (content): Merge conflict in drivers/ide/ide-disk.c
CONFLICT (content): Merge conflict in drivers/md/dm-mpath.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Applying block: fix build of mspro_block
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/scsi/qlogicpti.c
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/kernel/process_64.c
CONFLICT (content): Merge conflict in arch/x86/kernel/traps_64.c
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in 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/reg-for-linus
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in drivers/char/tty_io.c
CONFLICT (content): Merge conflict in drivers/char/vt.c
CONFLICT (content): Merge conflict in drivers/serial/68328serial.c
CONFLICT (content): Merge conflict in drivers/serial/8250.c
CONFLICT (content): Merge conflict in drivers/usb/serial/aircable.c
CONFLICT (content): Merge conflict in drivers/usb/serial/keyspan_pda.c
CONFLICT (content): Merge conflict in drivers/usb/serial/safe_serial.c
CONFLICT (content): Merge conflict in kernel/auditsc.c
Merging agp/agp-next
Merging creds/next-creds
CONFLICT (content): Merge conflict in drivers/net/wan/sbni.c
CONFLICT (content): Merge conflict in fs/namespace.c
CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_linux.h
CONFLICT (content): Merge conflict in fs/xfs/xfs_inode.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.c
CONFLICT (content): Merge conflict in include/linux/capability.h
CONFLICT (add/add): Merge conflict in include/linux/cred.h
CONFLICT (content): Merge conflict in include/linux/security.h
CONFLICT (content): Merge conflict in kernel/exit.c
CONFLICT (content): Merge conflict in kernel/fork.c
CONFLICT (content): Merge conflict in security/commoncap.c
CONFLICT (content): Merge conflict in security/selinux/hooks.c
CONFLICT (content): Merge conflict in security/smack/smack_lsm.c
Merging oprofile/auto-oprofile-next
CONFLICT (content): Merge conflict in arch/x86/oprofile/nmi_int.c
Merging fastboot/auto-fastboot-next
CONFLICT (content): Merge conflict in include/linux/init.h
Merging sparseirq/auto-sparseirq-next
CONFLICT (content): Merge conflict in arch/x86/kernel/ptrace.c
CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.h
CONFLICT (content): Merge conflict in drivers/pci/probe.c
CONFLICT (content): Merge conflict in include/asm-x86/msr-index.h
$ git checkout -b temp scsi-post-merge/master
Applying [SCSI] Add helper code so transport classes/driver can control queueing (v3)
Applying [SCSI] qla4xxx: return SCSI_MLQUEUE_TARGET_BUSY when driver has detected session error
Applying [SCSI] qla2xxx: return SCSI_MLQUEUE_TARGET_BUSY when driver has detected rport error or race
Applying [SCSI] libiscsi: Use SCSI_MLQUEUE_TARGET_BUSY
Applying [SCSI] lpfc: use SCSI_MLQUEUE_TARGET_BUSY when catching the rport transition race
Applying [SCSI] fc class: unblock target after calling terminate callback (take 2)
Applying [SCSI] ibmvfc, qla2xxx, lpfc: remove scsi_target_unblock calls in terminate callbacks
Applying [SCSI] scsi: add transport host byte errors (v3)
Applying [SCSI] iscsi class, libiscsi and qla4xxx: convert to new transport host byte values
Applying [SCSI] fc class: Add support for new transport errors
Applying [SCSI] qla2xxx: use new host byte transport errors.
Applying [SCSI] block: separate failfast into multiple bits.
Applying [SCSI] modify scsi to handle new fail fast flags.
Applying [SCSI] lpfc 8.2.8 : Add kernel-doc function headers
Applying [SCSI] lpfc 8.2.8 : Miscellaneous Discovery Fixes
Applying [SCSI] lpfc 8.2.8 : Update driver for new SLI-3 features
Applying [SCSI] lpfc 8.2.8 : Miscellaneous Bug Fixes
Applying [SCSI] lpfc 8.2.8 : Add new FCOE hardware support
Applying [SCSI] lpfc 8.2.8 : Add support for PCI-EEH permanent disabling
Applying [SCSI] lpfc 8.2.8 : Update driver to use new Host byte error code DID_TRANSPORT_DISRUPTED
Applying [SCSI] lpfc 8.2.8 : Add MSI-X support
Applying [SCSI] lpfc 8.2.8 : update driver version to 8.2.8
Applying scsi_dh_alua: remove REQ_NOMERGE
Applying lpfc 8.2.8 v2 : Revert target busy in favor of transport disrupted
Applying lpfc 8.2.8 v2 : Add sysfs control of target queue depth handling
Applying lpfc 8.2.8 v2 : Add statistical reporting control and additional fc vendor events
$ git checkout master
$ git checkout -b temp bdev/master
Applying [PATCH] introduce fmode_t, do annotations
Applying [PATCH] eliminate use of ->f_flags in block methods
Applying [PATCH] pass mode instead of file to sg_io()
Applying [PATCH] switch sg_scsi_ioctl() to passing fmode_t
Applying [PATCH] switch scsi_cmd_ioctl() to passing fmode_t
Applying [PATCH] lose the unused file argument in generic_ide_ioctl()
Applying [PATCH] lose unused arguments in dm ioctl callbacks
Applying [PATCH] move block_device_operations to blkdev.h
Applying [PATCH] switch cdrom_{open,release,ioctl} to sane APIs
Applying [PATCH] switch pktcdvd to blkdev_driver_ioctl()
Applying [PATCH] introduce __blkdev_driver_ioctl()
Applying [PATCH] don't mess with file in scsi_nonblockable_ioctl()
Applying [PATCH] beginning of methods conversion
Applying [PATCH] switch ubd
Applying [PATCH] switch DAC960
Applying [PATCH] switch amiflop
Applying [PATCH] switch aoeblk
Applying [PATCH] switch ataflop
Applying [PATCH] switch brd
Applying [PATCH] switch cciss
Applying [PATCH] switch cpqarray
Applying [PATCH] switch floppy
Applying [PATCH] switch loop
Applying [PATCH] switch nbd
Applying [PATCH] switch pcd
Applying [PATCH] switch pd
Applying [PATCH] switch pf
Applying [PATCH] switch pktdvdcd
Applying [PATCH] switch swim3
Applying [PATCH] switch ub
Applying [PATCH] switch viodasd
Applying [PATCH] switch virtio_blk
Applying [PATCH] switch xd
Applying [PATCH] switch xen
Applying [PATCH] switch xyspace
Applying [PATCH] switch z2ram
Applying [PATCH] switch gdrom
Applying [PATCH] switch viocd
Applying [PATCH] switch ide-cd
Applying [PATCH] switch ide-disk
Applying [PATCH] switch ide-floppy
Applying [PATCH] switch ide-tape
Applying [PATCH] switch dm
Applying [PATCH] switch md
Applying [PATCH] switch memstick
Applying [PATCH] switch i2o
Applying [PATCH] switch mmc
Applying [PATCH] switch mtd_blkdevs
Applying [PATCH] switch dasd
Applying [PATCH] switch dcssblk
Applying [PATCH] switch tape_block
Applying [PATCH] switch ide-scsi
Applying [PATCH] switch sd
Applying [PATCH] switch sr
Applying [PATCH] end of methods switch: remove the old ones
Applying [PATCH] trim file propagation in block/compat_ioctl.c
Applying [PATCH] kill the unused bsize on the send side of /dev/loop
Applying [PATCH] pass fmode_t to blkdev_put()
Applying [PATCH] propagate mode through open_bdev_excl/close_bdev_excl
Applying [PATCH] propagate mode through swsusp_close()
Applying [PATCH] remember mode of reiserfs journal
Applying [PATCH] sanitize blkdev_get() and friends
$ git checkout master
Applying sparc: qlogicpti fallout from sbus removal
Applying fix IXGBE dependencies
Applying linux-next: net tree build failure (depca)
Applying linux-next: 3c509 build fix
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: Tree for September 16
2008-09-16 7:34 linux-next: Tree for September 16 Stephen Rothwell
@ 2008-09-16 18:00 ` Takashi Iwai
2008-09-16 18:50 ` linux-next: Tree for September 16 (cpustr.h) Randy.Dunlap
2008-09-16 19:29 ` [PATCH -next] blkdev.h: fix warnings when CONFIG_BLOCK=n Randy.Dunlap
2 siblings, 0 replies; 10+ messages in thread
From: Takashi Iwai @ 2008-09-16 18:00 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
At Tue, 16 Sep 2008 17:34:15 +1000,
Stephen Rothwell wrote:
>
> News: I have added a file (Next/SHA1s) that contains the SHA1 of the head
> of each merged tree. Hopefully people will find it useful.
Thanks for a quick action!
This can help to reduce bisection time when a regression is known to
be on a certain subsystem tree.
Takashi
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: Tree for September 16 (cpustr.h)
2008-09-16 7:34 linux-next: Tree for September 16 Stephen Rothwell
2008-09-16 18:00 ` Takashi Iwai
@ 2008-09-16 18:50 ` Randy.Dunlap
2008-09-16 20:48 ` H. Peter Anvin
2008-09-16 19:29 ` [PATCH -next] blkdev.h: fix warnings when CONFIG_BLOCK=n Randy.Dunlap
2 siblings, 1 reply; 10+ messages in thread
From: Randy.Dunlap @ 2008-09-16 18:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, x86
[-- Attachment #1: Type: TEXT/PLAIN, Size: 1496 bytes --]
I'm seeing lots of gcc warnings from the generated cpustr.h file, like so:
arch/x86/boot/mkcpustr > arch/x86/boot/cpustr.h
gcc -Wp,-MD,arch/x86/boot/.cpu.o.d -nostdinc -isystem /usr/lib/gcc/x86_64-redhat-linux/4.1.1/include -D__KERNEL__ -Iinclude -Iinclude2 -I/home/rdunlap/linsrc/linux-next-20080916/include -I/home/rdunlap/linsrc/linux-next-20080916/arch/x86/include -include include/linux/autoconf.h -I/home/rdunlap/linsrc/linux-next-20080916/arch/x86/boot -Iarch/x86/boot -I/home/rdunlap/linsrc/linux-next-20080916/include -Iinclude -I/home/rdunlap/linsrc/linux-next-20080916/include2 -Iinclude2 -I/home/rdunlap/linsrc/linux-next-20080916/include -I/home/rdunlap/linsrc/linux-next-20080916/arch/x86/include -include include/linux/autoconf.h -g -Os -D_SETUP -D__KERNEL__ -Wall -Wstrict-prototypes -march=i386 -mregparm=3 -include /home/rdunlap/linsrc/linux-next-20080916/arch/x86/boot/code16gcc.h -fno-strict-aliasing -fomit-frame-pointer -ffreestanding -fno-unit-at-a-time -fno-stack-protector -mpreferred-stack-boundary=2 -m32 -D__BIG_KERNEL__ -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(cpu)" -D"KBUILD_MODNAME=KBUILD_STR(cpu)" -D"DEBUG_HASH=3" -D"DEBUG_HASH2=23" -c -o arch/x86/boot/cpu.o /home/rdunlap/linsrc/linux-next-20080916/arch/x86/boot/cpu.c
cc1: warning: hex escape sequence out of range
The ending lines of cpustr.h include hex strings like "\x111".
gcc complains about these. If I change them to "\x011" (e.g.), there
is no warning.
--
~Randy
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH -next] blkdev.h: fix warnings when CONFIG_BLOCK=n
2008-09-16 7:34 linux-next: Tree for September 16 Stephen Rothwell
2008-09-16 18:00 ` Takashi Iwai
2008-09-16 18:50 ` linux-next: Tree for September 16 (cpustr.h) Randy.Dunlap
@ 2008-09-16 19:29 ` Randy.Dunlap
2008-09-16 21:50 ` Jens Axboe
2 siblings, 1 reply; 10+ messages in thread
From: Randy.Dunlap @ 2008-09-16 19:29 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, akpm, LKML, axboe
From: Randy Dunlap <randy.dunlap@oracle•com>
Fix lots of build warnings when CONFIG_BLOCK=n:
linux-next-20080916/include/linux/blkdev.h:1093: warning: 'struct block_device' declared inside parameter list
linux-next-20080916/include/linux/blkdev.h:1093: warning: its scope is only this definition or declaration, which is probably not what you want
linux-next-20080916/include/linux/blkdev.h:1097: warning: 'struct gendisk' declared inside parameter list
linux-next-20080916/include/linux/blkdev.h:1105: warning: 'struct hd_geometry' declared inside parameter list
Signed-off-by: Randy Dunlap <randy.dunlap@oracle•com>
---
include/linux/blkdev.h | 4 ++++
1 file changed, 4 insertions(+)
--- linux-next-20080916.orig/include/linux/blkdev.h
+++ linux-next-20080916/include/linux/blkdev.h
@@ -1089,6 +1089,10 @@ static inline long nr_blockdev_pages(voi
#endif /* CONFIG_BLOCK */
+struct block_device;
+struct gendisk;
+struct hd_geometry;
+
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
unsigned long);
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: Tree for September 16 (cpustr.h)
2008-09-16 18:50 ` linux-next: Tree for September 16 (cpustr.h) Randy.Dunlap
@ 2008-09-16 20:48 ` H. Peter Anvin
2008-09-19 20:28 ` Randy Dunlap
0 siblings, 1 reply; 10+ messages in thread
From: H. Peter Anvin @ 2008-09-16 20:48 UTC (permalink / raw)
To: Randy.Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, x86
[-- Attachment #1: Type: text/plain, Size: 1921 bytes --]
Randy.Dunlap wrote:
> I'm seeing lots of gcc warnings from the generated cpustr.h file, like so:
>
> arch/x86/boot/mkcpustr > arch/x86/boot/cpustr.h
> gcc -Wp,-MD,arch/x86/boot/.cpu.o.d -nostdinc -isystem /usr/lib/gcc/x86_64-redhat-linux/4.1.1/include -D__KERNEL__ -Iinclude -Iinclude2 -I/home/rdunlap/linsrc/linux-next-20080916/include -I/home/rdunlap/linsrc/linux-next-20080916/arch/x86/include -include include/linux/autoconf.h -I/home/rdunlap/linsrc/linux-next-20080916/arch/x86/boot -Iarch/x86/boot -I/home/rdunlap/linsrc/linux-next-20080916/include -Iinclude -I/home/rdunlap/linsrc/linux-next-20080916/include2 -Iinclude2 -I/home/rdunlap/linsrc/linux-next-20080916/include -I/home/rdunlap/linsrc/linux-next-20080916/arch/x86/include -include include/linux/autoconf.h -g -Os -D_SETUP -D__KERNEL__ -Wall -Wstrict-prototypes -march=i386 -mregparm=3 -include /home/rdunlap/linsrc/linux-next-20080916/arch/x86/boot/code16gcc.h -fno-strict-alia
sing -fomit-frame-pointer -ffreestanding -fno-unit-at-a-time -fno-stack-protector -mpreferred-stack-boundary=2 -m32 -D__BIG_KERNEL__ -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(cpu)"
-D"KBUILD_MODNAME=KBUILD_STR(cpu)" -D"DEBUG_HASH=3" -D"DEBUG_HASH2=23" -c -o arch/x86/boot/cpu.o /home/rdunlap/linsrc/linux-next-20080916/arch/x86/boot/cpu.c
> cc1: warning: hex escape sequence out of range
>
>
> The ending lines of cpustr.h include hex strings like "\x111".
> gcc complains about these. If I change them to "\x011" (e.g.), there
> is no warning.
>
Yes, there is a patch that adds a 9th cpuflags word, which this code
doesn't handle. The warning is real, there is an #error in mkcpustr.c
which is supposed to trigger, but doesn't because of a typo:
#if NCAPFLAGS > 8
# error "Need to adjust the boot code handling of CPUID strings"
#endif
(The actual variable is called NCAPINTS.)
Attached is a completely untested patch for this problem.
-hpa
[-- Attachment #2: diff --]
[-- Type: text/plain, Size: 2230 bytes --]
diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c
index 75298fe..6ec6bb6 100644
--- a/arch/x86/boot/cpu.c
+++ b/arch/x86/boot/cpu.c
@@ -59,17 +59,18 @@ int validate_cpu(void)
u32 e = err_flags[i];
for (j = 0; j < 32; j++) {
- int n = (i << 5)+j;
- if (*msg_strs < n) {
+ if (msg_strs[0] < i ||
+ (msg_strs[0] == i && msg_strs[1] < j)) {
/* Skip to the next string */
- do {
- msg_strs++;
- } while (*msg_strs);
- msg_strs++;
+ msg_strs += 2;
+ while (*msg_strs++)
+ ;
}
if (e & 1) {
- if (*msg_strs == n && msg_strs[1])
- printf("%s ", msg_strs+1);
+ if (msg_strs[0] == i &&
+ msg_strs[1] == j &&
+ msg_strs[2])
+ printf("%s ", msg_strs+2);
else
printf("%d:%d ", i, j);
}
diff --git a/arch/x86/boot/mkcpustr.c b/arch/x86/boot/mkcpustr.c
index 4589caa..8ef60f2 100644
--- a/arch/x86/boot/mkcpustr.c
+++ b/arch/x86/boot/mkcpustr.c
@@ -17,31 +17,31 @@
#include "../kernel/cpu/capflags.c"
-#if NCAPFLAGS > 8
-# error "Need to adjust the boot code handling of CPUID strings"
-#endif
-
int main(void)
{
- int i;
+ int i, j;
const char *str;
printf("static const char x86_cap_strs[] = \n");
- for (i = 0; i < NCAPINTS*32; i++) {
- str = x86_cap_flags[i];
-
- if (i == NCAPINTS*32-1) {
- /* The last entry must be unconditional; this
- also consumes the compiler-added null character */
- if (!str)
- str = "";
- printf("\t\"\\x%02x\"\"%s\"\n", i, str);
- } else if (str) {
- printf("#if REQUIRED_MASK%d & (1 << %d)\n"
- "\t\"\\x%02x\"\"%s\\0\"\n"
- "#endif\n",
- i >> 5, i & 31, i, str);
+ for (i = 0; i < NCAPINTS; i++) {
+ for (j = 0; j < 32; j++) {
+ str = x86_cap_flags[i*32+j];
+
+ if (i == NCAPINTS-1 && j == 31) {
+ /* The last entry must be unconditional; this
+ also consumes the compiler-added null
+ character */
+ if (!str)
+ str = "";
+ printf("\t\"\\x%02x\\x%02x\"\"%s\"\n",
+ i, j, str);
+ } else if (str) {
+ printf("#if REQUIRED_MASK%d & (1 << %d)\n"
+ "\t\"\\x%02x\\x%02x\"\"%s\\0\"\n"
+ "#endif\n",
+ i, j, i, j, str);
+ }
}
}
printf("\t;\n");
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH -next] blkdev.h: fix warnings when CONFIG_BLOCK=n
2008-09-16 19:29 ` [PATCH -next] blkdev.h: fix warnings when CONFIG_BLOCK=n Randy.Dunlap
@ 2008-09-16 21:50 ` Jens Axboe
2008-09-16 22:16 ` Stephen Rothwell
0 siblings, 1 reply; 10+ messages in thread
From: Jens Axboe @ 2008-09-16 21:50 UTC (permalink / raw)
To: Randy.Dunlap; +Cc: Stephen Rothwell, linux-next, akpm, LKML
On Tue, Sep 16 2008, Randy.Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle•com>
>
> Fix lots of build warnings when CONFIG_BLOCK=n:
>
> linux-next-20080916/include/linux/blkdev.h:1093: warning: 'struct block_device' declared inside parameter list
> linux-next-20080916/include/linux/blkdev.h:1093: warning: its scope is only this definition or declaration, which is probably not what you want
> linux-next-20080916/include/linux/blkdev.h:1097: warning: 'struct gendisk' declared inside parameter list
> linux-next-20080916/include/linux/blkdev.h:1105: warning: 'struct hd_geometry' declared inside parameter list
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle•com>
> ---
> include/linux/blkdev.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> --- linux-next-20080916.orig/include/linux/blkdev.h
> +++ linux-next-20080916/include/linux/blkdev.h
> @@ -1089,6 +1089,10 @@ static inline long nr_blockdev_pages(voi
>
> #endif /* CONFIG_BLOCK */
>
> +struct block_device;
> +struct gendisk;
> +struct hd_geometry;
> +
> extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
> unsigned long);
>
Not sure which tree that build problem came from, it isn't from the
block git tree.
--
Jens Axboe
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH -next] blkdev.h: fix warnings when CONFIG_BLOCK=n
2008-09-16 21:50 ` Jens Axboe
@ 2008-09-16 22:16 ` Stephen Rothwell
0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2008-09-16 22:16 UTC (permalink / raw)
To: Al Viro; +Cc: Jens Axboe, Randy.Dunlap, linux-next, akpm, LKML
[-- Attachment #1: Type: text/plain, Size: 1704 bytes --]
Hi Al,
On Tue, 16 Sep 2008 23:50:40 +0200 Jens Axboe <jens.axboe@oracle•com> wrote:
>
> On Tue, Sep 16 2008, Randy.Dunlap wrote:
> > From: Randy Dunlap <randy.dunlap@oracle•com>
> >
> > Fix lots of build warnings when CONFIG_BLOCK=n:
> >
> > linux-next-20080916/include/linux/blkdev.h:1093: warning: 'struct block_device' declared inside parameter list
> > linux-next-20080916/include/linux/blkdev.h:1093: warning: its scope is only this definition or declaration, which is probably not what you want
> > linux-next-20080916/include/linux/blkdev.h:1097: warning: 'struct gendisk' declared inside parameter list
> > linux-next-20080916/include/linux/blkdev.h:1105: warning: 'struct hd_geometry' declared inside parameter list
> >
> > Signed-off-by: Randy Dunlap <randy.dunlap@oracle•com>
> > ---
> > include/linux/blkdev.h | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > --- linux-next-20080916.orig/include/linux/blkdev.h
> > +++ linux-next-20080916/include/linux/blkdev.h
> > @@ -1089,6 +1089,10 @@ static inline long nr_blockdev_pages(voi
> >
> > #endif /* CONFIG_BLOCK */
> >
> > +struct block_device;
> > +struct gendisk;
> > +struct hd_geometry;
> > +
> > extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
> > unsigned long);
> >
>
> Not sure which tree that build problem came from, it isn't from the
> block git tree.
I suspect this is caused by commit
44e95e9e8be95ec9ac6b0678e491883d99c0cfd8 ("beginning of methods
conversion") from your bdev tree. (the commit id is from next-20090816)
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: Tree for September 16 (cpustr.h)
2008-09-16 20:48 ` H. Peter Anvin
@ 2008-09-19 20:28 ` Randy Dunlap
0 siblings, 0 replies; 10+ messages in thread
From: Randy Dunlap @ 2008-09-19 20:28 UTC (permalink / raw)
To: H. Peter Anvin; +Cc: Stephen Rothwell, linux-next, LKML, x86
[-- Attachment #1: Type: text/plain, Size: 2144 bytes --]
On Tue, 16 Sep 2008 13:48:25 -0700 H. Peter Anvin wrote:
> Randy.Dunlap wrote:
> > I'm seeing lots of gcc warnings from the generated cpustr.h file, like so:
> >
> > arch/x86/boot/mkcpustr > arch/x86/boot/cpustr.h
> > gcc -Wp,-MD,arch/x86/boot/.cpu.o.d -nostdinc -isystem /usr/lib/gcc/x86_64-redhat-linux/4.1.1/include -D__KERNEL__ -Iinclude -Iinclude2 -I/home/rdunlap/linsrc/linux-next-20080916/include -I/home/rdunlap/linsrc/linux-next-20080916/arch/x86/include -include include/linux/autoconf.h -I/home/rdunlap/linsrc/linux-next-20080916/arch/x86/boot -Iarch/x86/boot -I/home/rdunlap/linsrc/linux-next-20080916/include -Iinclude -I/home/rdunlap/linsrc/linux-next-20080916/include2 -Iinclude2 -I/home/rdunlap/linsrc/linux-next-20080916/include -I/home/rdunlap/linsrc/linux-next-20080916/arch/x86/include -include include/linux/autoconf.h -g -Os -D_SETUP -D__KERNEL__ -Wall -Wstrict-prototypes -march=i386 -mregparm=3 -include /home/rdunlap/linsrc/linux-next-20080916/arch/x86/boot/code16gcc.h -fno-strict-al
iasing -fomit-frame-pointer -ffreestanding -fno-unit-at-a-time -fno-stack-protector -mpreferred-stack-boundary=2 -m32 -D__BIG_KERNEL__ -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(cpu)"
> -D"KBUILD_MODNAME=KBUILD_STR(cpu)" -D"DEBUG_HASH=3" -D"DEBUG_HASH2=23" -c -o arch/x86/boot/cpu.o /home/rdunlap/linsrc/linux-next-20080916/arch/x86/boot/cpu.c
> > cc1: warning: hex escape sequence out of range
> >
> >
> > The ending lines of cpustr.h include hex strings like "\x111".
> > gcc complains about these. If I change them to "\x011" (e.g.), there
> > is no warning.
> >
>
> Yes, there is a patch that adds a 9th cpuflags word, which this code
> doesn't handle. The warning is real, there is an #error in mkcpustr.c
> which is supposed to trigger, but doesn't because of a typo:
>
> #if NCAPFLAGS > 8
> # error "Need to adjust the boot code handling of CPUID strings"
> #endif
>
> (The actual variable is called NCAPINTS.)
>
> Attached is a completely untested patch for this problem.
That builds cleanly and the produced cpustr.h output file looks good to me.
It's attached for your checking.
---
~Randy
[-- Attachment #2: cpustr.h --]
[-- Type: text/x-chdr, Size: 6306 bytes --]
static const char x86_cap_strs[] =
#if REQUIRED_MASK0 & (1 << 0)
"\x00\x00""fpu\0"
#endif
#if REQUIRED_MASK0 & (1 << 1)
"\x00\x01""vme\0"
#endif
#if REQUIRED_MASK0 & (1 << 2)
"\x00\x02""de\0"
#endif
#if REQUIRED_MASK0 & (1 << 3)
"\x00\x03""pse\0"
#endif
#if REQUIRED_MASK0 & (1 << 4)
"\x00\x04""tsc\0"
#endif
#if REQUIRED_MASK0 & (1 << 5)
"\x00\x05""msr\0"
#endif
#if REQUIRED_MASK0 & (1 << 6)
"\x00\x06""pae\0"
#endif
#if REQUIRED_MASK0 & (1 << 7)
"\x00\x07""mce\0"
#endif
#if REQUIRED_MASK0 & (1 << 8)
"\x00\x08""cx8\0"
#endif
#if REQUIRED_MASK0 & (1 << 9)
"\x00\x09""apic\0"
#endif
#if REQUIRED_MASK0 & (1 << 11)
"\x00\x0b""sep\0"
#endif
#if REQUIRED_MASK0 & (1 << 12)
"\x00\x0c""mtrr\0"
#endif
#if REQUIRED_MASK0 & (1 << 13)
"\x00\x0d""pge\0"
#endif
#if REQUIRED_MASK0 & (1 << 14)
"\x00\x0e""mca\0"
#endif
#if REQUIRED_MASK0 & (1 << 15)
"\x00\x0f""cmov\0"
#endif
#if REQUIRED_MASK0 & (1 << 16)
"\x00\x10""pat\0"
#endif
#if REQUIRED_MASK0 & (1 << 17)
"\x00\x11""pse36\0"
#endif
#if REQUIRED_MASK0 & (1 << 18)
"\x00\x12""pn\0"
#endif
#if REQUIRED_MASK0 & (1 << 19)
"\x00\x13""clflush\0"
#endif
#if REQUIRED_MASK0 & (1 << 21)
"\x00\x15""dts\0"
#endif
#if REQUIRED_MASK0 & (1 << 22)
"\x00\x16""acpi\0"
#endif
#if REQUIRED_MASK0 & (1 << 23)
"\x00\x17""mmx\0"
#endif
#if REQUIRED_MASK0 & (1 << 24)
"\x00\x18""fxsr\0"
#endif
#if REQUIRED_MASK0 & (1 << 25)
"\x00\x19""sse\0"
#endif
#if REQUIRED_MASK0 & (1 << 26)
"\x00\x1a""sse2\0"
#endif
#if REQUIRED_MASK0 & (1 << 27)
"\x00\x1b""ss\0"
#endif
#if REQUIRED_MASK0 & (1 << 28)
"\x00\x1c""ht\0"
#endif
#if REQUIRED_MASK0 & (1 << 29)
"\x00\x1d""tm\0"
#endif
#if REQUIRED_MASK0 & (1 << 30)
"\x00\x1e""ia64\0"
#endif
#if REQUIRED_MASK0 & (1 << 31)
"\x00\x1f""pbe\0"
#endif
#if REQUIRED_MASK1 & (1 << 11)
"\x01\x0b""syscall\0"
#endif
#if REQUIRED_MASK1 & (1 << 19)
"\x01\x13""mp\0"
#endif
#if REQUIRED_MASK1 & (1 << 20)
"\x01\x14""nx\0"
#endif
#if REQUIRED_MASK1 & (1 << 22)
"\x01\x16""mmxext\0"
#endif
#if REQUIRED_MASK1 & (1 << 25)
"\x01\x19""fxsr_opt\0"
#endif
#if REQUIRED_MASK1 & (1 << 26)
"\x01\x1a""pdpe1gb\0"
#endif
#if REQUIRED_MASK1 & (1 << 27)
"\x01\x1b""rdtscp\0"
#endif
#if REQUIRED_MASK1 & (1 << 29)
"\x01\x1d""lm\0"
#endif
#if REQUIRED_MASK1 & (1 << 30)
"\x01\x1e""3dnowext\0"
#endif
#if REQUIRED_MASK1 & (1 << 31)
"\x01\x1f""3dnow\0"
#endif
#if REQUIRED_MASK2 & (1 << 0)
"\x02\x00""recovery\0"
#endif
#if REQUIRED_MASK2 & (1 << 1)
"\x02\x01""longrun\0"
#endif
#if REQUIRED_MASK2 & (1 << 3)
"\x02\x03""lrti\0"
#endif
#if REQUIRED_MASK3 & (1 << 0)
"\x03\x00""cxmmx\0"
#endif
#if REQUIRED_MASK3 & (1 << 1)
"\x03\x01""k6_mtrr\0"
#endif
#if REQUIRED_MASK3 & (1 << 2)
"\x03\x02""cyrix_arr\0"
#endif
#if REQUIRED_MASK3 & (1 << 3)
"\x03\x03""centaur_mcr\0"
#endif
#if REQUIRED_MASK3 & (1 << 8)
"\x03\x08""constant_tsc\0"
#endif
#if REQUIRED_MASK3 & (1 << 9)
"\x03\x09""up\0"
#endif
#if REQUIRED_MASK3 & (1 << 11)
"\x03\x0b""arch_perfmon\0"
#endif
#if REQUIRED_MASK3 & (1 << 12)
"\x03\x0c""pebs\0"
#endif
#if REQUIRED_MASK3 & (1 << 13)
"\x03\x0d""bts\0"
#endif
#if REQUIRED_MASK3 & (1 << 16)
"\x03\x10""rep_good\0"
#endif
#if REQUIRED_MASK3 & (1 << 20)
"\x03\x14""nopl\0"
#endif
#if REQUIRED_MASK3 & (1 << 21)
"\x03\x15""xtopology\0"
#endif
#if REQUIRED_MASK4 & (1 << 0)
"\x04\x00""pni\0"
#endif
#if REQUIRED_MASK4 & (1 << 1)
"\x04\x01""pclmulqdq\0"
#endif
#if REQUIRED_MASK4 & (1 << 2)
"\x04\x02""dtes64\0"
#endif
#if REQUIRED_MASK4 & (1 << 3)
"\x04\x03""monitor\0"
#endif
#if REQUIRED_MASK4 & (1 << 4)
"\x04\x04""ds_cpl\0"
#endif
#if REQUIRED_MASK4 & (1 << 5)
"\x04\x05""vmx\0"
#endif
#if REQUIRED_MASK4 & (1 << 6)
"\x04\x06""smx\0"
#endif
#if REQUIRED_MASK4 & (1 << 7)
"\x04\x07""est\0"
#endif
#if REQUIRED_MASK4 & (1 << 8)
"\x04\x08""tm2\0"
#endif
#if REQUIRED_MASK4 & (1 << 9)
"\x04\x09""ssse3\0"
#endif
#if REQUIRED_MASK4 & (1 << 10)
"\x04\x0a""cid\0"
#endif
#if REQUIRED_MASK4 & (1 << 12)
"\x04\x0c""fma\0"
#endif
#if REQUIRED_MASK4 & (1 << 13)
"\x04\x0d""cx16\0"
#endif
#if REQUIRED_MASK4 & (1 << 14)
"\x04\x0e""xtpr\0"
#endif
#if REQUIRED_MASK4 & (1 << 15)
"\x04\x0f""pdcm\0"
#endif
#if REQUIRED_MASK4 & (1 << 18)
"\x04\x12""dca\0"
#endif
#if REQUIRED_MASK4 & (1 << 19)
"\x04\x13""sse4_1\0"
#endif
#if REQUIRED_MASK4 & (1 << 20)
"\x04\x14""sse4_2\0"
#endif
#if REQUIRED_MASK4 & (1 << 21)
"\x04\x15""x2apic\0"
#endif
#if REQUIRED_MASK4 & (1 << 25)
"\x04\x19""aes\0"
#endif
#if REQUIRED_MASK4 & (1 << 26)
"\x04\x1a""xsave\0"
#endif
#if REQUIRED_MASK4 & (1 << 28)
"\x04\x1c""avx\0"
#endif
#if REQUIRED_MASK5 & (1 << 2)
"\x05\x02""rng\0"
#endif
#if REQUIRED_MASK5 & (1 << 3)
"\x05\x03""rng_en\0"
#endif
#if REQUIRED_MASK5 & (1 << 6)
"\x05\x06""ace\0"
#endif
#if REQUIRED_MASK5 & (1 << 7)
"\x05\x07""ace_en\0"
#endif
#if REQUIRED_MASK5 & (1 << 8)
"\x05\x08""ace2\0"
#endif
#if REQUIRED_MASK5 & (1 << 9)
"\x05\x09""ace2_en\0"
#endif
#if REQUIRED_MASK5 & (1 << 10)
"\x05\x0a""phe\0"
#endif
#if REQUIRED_MASK5 & (1 << 11)
"\x05\x0b""phe_en\0"
#endif
#if REQUIRED_MASK5 & (1 << 12)
"\x05\x0c""pmm\0"
#endif
#if REQUIRED_MASK5 & (1 << 13)
"\x05\x0d""pmm_en\0"
#endif
#if REQUIRED_MASK6 & (1 << 0)
"\x06\x00""lahf_lm\0"
#endif
#if REQUIRED_MASK6 & (1 << 1)
"\x06\x01""cmp_legacy\0"
#endif
#if REQUIRED_MASK6 & (1 << 2)
"\x06\x02""svm\0"
#endif
#if REQUIRED_MASK6 & (1 << 3)
"\x06\x03""extapic\0"
#endif
#if REQUIRED_MASK6 & (1 << 4)
"\x06\x04""cr8_legacy\0"
#endif
#if REQUIRED_MASK6 & (1 << 5)
"\x06\x05""abm\0"
#endif
#if REQUIRED_MASK6 & (1 << 6)
"\x06\x06""sse4a\0"
#endif
#if REQUIRED_MASK6 & (1 << 7)
"\x06\x07""misalignsse\0"
#endif
#if REQUIRED_MASK6 & (1 << 8)
"\x06\x08""3dnowprefetch\0"
#endif
#if REQUIRED_MASK6 & (1 << 9)
"\x06\x09""osvw\0"
#endif
#if REQUIRED_MASK6 & (1 << 10)
"\x06\x0a""ibs\0"
#endif
#if REQUIRED_MASK6 & (1 << 11)
"\x06\x0b""sse5\0"
#endif
#if REQUIRED_MASK6 & (1 << 12)
"\x06\x0c""skinit\0"
#endif
#if REQUIRED_MASK6 & (1 << 13)
"\x06\x0d""wdt\0"
#endif
#if REQUIRED_MASK7 & (1 << 0)
"\x07\x00""ida\0"
#endif
#if REQUIRED_MASK8 & (1 << 0)
"\x08\x00""tpr_shadow\0"
#endif
#if REQUIRED_MASK8 & (1 << 1)
"\x08\x01""vnmi\0"
#endif
#if REQUIRED_MASK8 & (1 << 2)
"\x08\x02""flexpriority\0"
#endif
#if REQUIRED_MASK8 & (1 << 3)
"\x08\x03""ept\0"
#endif
#if REQUIRED_MASK8 & (1 << 4)
"\x08\x04""vpid\0"
#endif
"\x08\x1f"""
;
^ permalink raw reply [flat|nested] 10+ messages in thread
* linux-next: Tree for September 16
@ 2009-09-16 5:57 Stephen Rothwell
0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2009-09-16 5:57 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7925 bytes --]
Hi all,
Please do not add code destined for 2.6.33 into linux-next trees until
(at least) 2.6.32-rc1 is out. This will hopefully give those who have
stuff destined for just after -rc1 a chance.
Changes since 20090915:
We are seeing conflicts move from one tree to another as Linus merges
them.
Linus' tree gained a build failure for which I applied a patch.
The rr tree still has a build failure so I used the version from
next-20090908.
The drbd tree lost its build failure.
The staging 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 140 trees (counting Linus' and 21 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Applying: edac: need to export cpu_llc_id
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
CONFLICT (add/add): Merge conflict in arch/arm/include/asm/unified.h
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
CONFLICT (content): Merge conflict in kernel/gcov/Kconfig
Merging mips/mips-for-linux-next
Merging parisc/next
CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
Merging sparc/master
Merging xtensa/master
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 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
Merging ubifs/linux-next
CONFLICT (content): Merge conflict in fs/ubifs/super.c
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_lrw.c
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in arch/powerpc/kernel/pci_64.c
Applying: pci: merge fixup for fundamental reset conflict with powerpc tree
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/sh_mobile_ceu_camera.c
Merging quota/for_next
Merging kbuild/master
CONFLICT (content): Merge conflict in scripts/extract-ikconfig
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in drivers/acpi/power.c
CONFLICT (content): Merge conflict in drivers/pci/dmar.c
Merging ieee1394/for-next
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/mtdcore.c
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in kernel/module.c
$ git reset --hard HEAD^
Merging refs/next/20090908/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
CONFLICT (content): Merge conflict in drivers/power/wm97xx_battery.c
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in firmware/Makefile
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/Kconfig
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
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Applying: tip: fix merge for cupmask update
Merging oprofile/for-next
Merging percpu/for-next
Merging sfi/sfi-test
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/class.c
CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
CONFLICT (content): Merge conflict in drivers/scsi/Makefile
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* linux-next: Tree for September 16
@ 2010-09-16 5:28 Stephen Rothwell
0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2010-09-16 5:28 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 10609 bytes --]
Hi all,
Changes since 20100915:
New Tree: irqflags
Dropped tree: irqflags (build problem)
The powerpc tree still has its build failure for which I applied a patch.
The block tree gained conflicts against Linus' tree.
The pcmcia tree gained conflicts against the net tree.
The kgdb tree still has its build failure for which I applied a patch.
The sound tree gained a build failure for which I reverted a commit.
The mfd tree lost its build failure but gained another so I used the
version from next-20100915 (with a commit reverted).
I still have a patch to the drivers-x86 tree to remove a Kconfig warning.
The blk-trivial tree lost its conflict but gained more against the pcmcia
tree.
The irqflags tree gained a conflict against the sh tree and a build
failure, so I dropped it for today.
----------------------------------------------------------------------------
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 173 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 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 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 gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c
CONFLICT (content): Merge conflict in arch/arm/plat-samsung/Kconfig
CONFLICT (content): Merge conflict in drivers/input/touchscreen/s3c2410_ts.c
Merging s5p/for-next
Merging tegra/for-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/next
Merging powerpc/next
Applying: powerpc: define a compat_sys_recv cond_syscall
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/mpc85xx_mds.c
Merging s390/features
Merging sh/master
Merging genesis/master
Merging sparc/master
Merging tile/master
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 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 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
CONFLICT (content): Merge conflict in drivers/media/IR/ir-keytable.c
CONFLICT (content): Merge conflict in drivers/media/IR/ir-lirc-codec.c
CONFLICT (content): Merge conflict in drivers/media/IR/ir-raw-event.c
CONFLICT (add/add): Merge conflict in drivers/media/IR/streamzap.c
CONFLICT (content): Merge conflict in drivers/media/dvb/siano/smscoreapi.c
CONFLICT (add/add): Merge conflict in drivers/media/video/s5p-fimc/fimc-core.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 ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_emulate.h
CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c
Merging dlm/next
Merging swiotlb/master
Merging swiotlb-xen/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound-asoc/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c
CONFLICT (content): Merge conflict in drivers/video/sh_mobile_hdmi.c
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in block/blk-core.c
CONFLICT (content): Merge conflict in drivers/block/loop.c
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/net/pcmcia/pcnet_cs.c
CONFLICT (content): Merge conflict in drivers/net/pcmcia/smc91c92_cs.c
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Applying: kgdb: merge fix for mode_set_base_atomic API change
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
$ git reset --hard HEAD^
Merging refs/next/20100915/mfd
[master c156fe1] Revert "misc: Add ab8500 pwm driver"
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging catalin/for-next
CONFLICT (content): Merge conflict in arch/arm/kernel/Makefile
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging i7core_edac/linux_next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging omap_dss2/for-next
Merging xen/upstream/xen
Merging rcu/rcu/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in net/core/dev.c
Merging lost-spurious-irq/lost-spurious-irq
CONFLICT (content): Merge conflict in drivers/ata/libata-core.c
CONFLICT (content): Merge conflict in include/linux/libata.h
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 drivers-x86/linux-next
Applying: Fix Kconfig mistaken update
Merging hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/gadget/rndis.c
Merging staging-next/staging-next
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/batman-adv/hard-interface.c
CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/Makefile deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/Makefile left in tree.
CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/intel-mid-touch.c deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/intel-mid-touch.c left in tree.
$ git rm -f drivers/staging/mrst-touchscreen/Makefile drivers/staging/mrst-touchscreen/intel-mid-touch.c
Merging slabh/slabh
Merging bkl-trivial/trivial
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4000_cs.c
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4040_cs.c
Merging bkl-llseek/llseek
CONFLICT (content): Merge conflict in drivers/char/virtio_console.c
Merging bkl-vfs/vfs
CONFLICT (content): Merge conflict in drivers/usb/gadget/inode.c
CONFLICT (content): Merge conflict in fs/nilfs2/super.c
Merging bkl-config/config
Merging irqflags/master
CONFLICT (content): Merge conflict in arch/sh/include/asm/syscalls_32.h
$ git reset --hard HEAD^
Merging scsi-post-merge/merge-base:master
[master fdbcca9] Revert "ALSA: hda - Set up COEFs for ALC269 to avoid click noises at power-saving"
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2010-09-16 5:28 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-16 7:34 linux-next: Tree for September 16 Stephen Rothwell
2008-09-16 18:00 ` Takashi Iwai
2008-09-16 18:50 ` linux-next: Tree for September 16 (cpustr.h) Randy.Dunlap
2008-09-16 20:48 ` H. Peter Anvin
2008-09-19 20:28 ` Randy Dunlap
2008-09-16 19:29 ` [PATCH -next] blkdev.h: fix warnings when CONFIG_BLOCK=n Randy.Dunlap
2008-09-16 21:50 ` Jens Axboe
2008-09-16 22:16 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-09-16 5:57 linux-next: Tree for September 16 Stephen Rothwell
2010-09-16 5:28 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox