Hi all,
Changes since next-20080623:
Changed trees: m68knommu and uclinux changed their branches.
The s390 tree gained a conflict with the driver-core tree.
The firmware tree gained a conflict with the net tree.
----------------------------------------------------------------------------
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 95 trees (counting Linus' and 13 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 [email protected]
$ 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 quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
CONFLICT (content): Merge conflict in kernel/Makefile
CONFLICT (content): Merge conflict in kernel/sched_rt.c
Applying sched: fix rculist split fallout
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c
CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c
Merging pci/linux-next
CONFLICT (content): Merge conflict in arch/x86/pci/irq.c
CONFLICT (content): Merge conflict in include/linux/device.h
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c
Merging quilt/kernel-doc
Merging avr32/avr32-arch
Merging v4l-dvb/stable
Applying v4l-dvb: class_for_each_device API change fallout
Created commit f773e39: Revert "V4L/DVB (8049): budget-ci: Add support for Technotrend budget C-1501 dvb-c card"
Merging s390/features
CONFLICT (content): Merge conflict in drivers/s390/block/dasd.c
CONFLICT (content): Merge conflict in drivers/s390/block/dasd_eckd.c
CONFLICT (content): Merge conflict in drivers/s390/block/dasd_fba.c
CONFLICT (content): Merge conflict in drivers/s390/char/tape_core.c
CONFLICT (content): Merge conflict in drivers/s390/cio/device_fsm.c
CONFLICT (content): Merge conflict in drivers/s390/cio/qdio.c
CONFLICT (content): Merge conflict in drivers/s390/net/claw.c
CONFLICT (content): Merge conflict in drivers/s390/net/ctcm_main.c
CONFLICT (content): Merge conflict in drivers/s390/net/lcs.c
Merging sh/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
CONFLICT (content): Merge conflict in drivers/acpi/processor_throttling.c
CONFLICT (content): Merge conflict in drivers/acpi/sleep/main.c
Merging blackfin/for-linus
Merging nfsd/nfsd-next
CONFLICT (content): Merge conflict in net/sunrpc/auth_gss/auth_gss.c
CONFLICT (content): Merge conflict in net/sunrpc/svc.c
Merging ieee1394/for-next
Merging hwmon/testing
Merging ubi/master
Merging kvm/master
Merging dlm/next
Merging scsi/master
Applying scsi: fix fallout from the class_find_device API change
Applying scsi: fix fallout from KOBJ_NAME_LEN removal
Merging ia64/test
Merging tests/master
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging ocfs2/linux-next
Merging selinux/for-akpm
Merging quilt/m68k
Merging powerpc/powerpc-next
Merging lblnet/master
Merging ext4/next
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging security-testing/next
Merging net/master
CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt
Applying wireless: fix fallout from device_create removal
Merging sparc/master
CONFLICT (content): Merge conflict in include/asm-m68k/sbus.h
Merging galak/powerpc-next
CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/vfs-2.6.25
Merging sound/master
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-yl-9200.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c
Merging cpufreq/next
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c
Merging v9fs/for-next
Merging quilt/rr
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging semaphore-removal/semaphore-removal
CONFLICT (content): Merge conflict in drivers/net/ps3_gelic_wireless.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_attr.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_def.h
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mbx.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mid.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c
Merging bkl-removal/bkl-removal
Merging trivial/next
Merging ubifs/for_andrew
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/x86/kernel/apic_32.c
CONFLICT (delete/modify): arch/x86/kernel/i8259_64.c deleted in HEAD and modified in block/for-next. Version block/for-next of arch/x86/kernel/i8259_64.c left in tree.
CONFLICT (content): Merge conflict in arch/x86/xen/smp.c
CONFLICT (delete/modify): include/asm-x86/hw_irq_32.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/hw_irq_32.h left in tree.
CONFLICT (delete/modify): include/asm-x86/hw_irq_64.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/hw_irq_64.h left in tree.
CONFLICT (delete/modify): include/asm-x86/mach-default/irq_vectors.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/mach-default/irq_vectors.h left in tree.
CONFLICT (delete/modify): include/asm-x86/mach-voyager/irq_vectors.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/mach-voyager/irq_vectors.h left in tree.
CONFLICT (content): Merge conflict in kernel/Makefile
Applying block: fix up rculist split fallout
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/char/ip2/ip2main.c
CONFLICT (content): Merge conflict in drivers/net/Kconfig
CONFLICT (content): Merge conflict in drivers/usb/misc/isight_firmware.c
CONFLICT (content): Merge conflict in drivers/usb/serial/Kconfig
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_3410.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_3410.h left in tree.
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_5052.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_5052.h left in tree.
CONFLICT (content): Merge conflict in drivers/usb/serial/ti_usb_3410_5052.c
CONFLICT (content): Merge conflict in sound/pci/Kconfig
CONFLICT (content): Merge conflict in sound/pci/maestro3.c
CONFLICT (content): Merge conflict in sound/pci/ymfpci/ymfpci_main.c
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/ide/legacy/ide-cs.c
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
CONFLICT (content): Merge conflict in drivers/video/backlight/Kconfig
CONFLICT (content): Merge conflict in drivers/video/backlight/Makefile
Merging kgdb/kgdb-next
Merging slab/for-next
Merging m68knommu/for-next
Merging uclinux/for-next
Hi Stephen,
While booting up the next-20080624 kernel on the x86_64 box, kernel panics.
Kernel panics of two different x86_64 machines are pasted below
BUG: unable to handle kernel NULL pointer dereference at 0000000000000008
IP: [<ffffffff803be0d0>] tg3_reset_hw+0xf48/0x154b
PGD 101e9067 PUD 10098067 PMD 0
Oops: 0000 [1] SMP
last sysfs file: /sys/class/net/eth1/address
CPU 0
Modules linked in: battery ac lp parport_pc parport nvram amd_rng rng_core pcspkr button i2c_amd756 i2c_core
Pid: 1922, comm: ip Not tainted 2.6.26-rc7-next-20080624-autotest #1
RIP: 0010:[<ffffffff803be0d0>] [<ffffffff803be0d0>] tg3_reset_hw+0xf48/0x154b
RSP: 0018:ffff8100101d5d38 EFLAGS: 00010246
RAX: 000000000040a026 RBX: 000000000001f800 RCX: 0000000000000000
RDX: 0000000000000006 RSI: 0000000000005400 RDI: ffff81003d49a740
RBP: ffff81003d49a740 R08: 0000000000000002 R09: 0000000000000008
R10: 0000000000000009 R11: ffffffff8047754d R12: 0000000001000008
R13: 00000000000003fe R14: ffff81003d49a748 R15: 0000000000000000
FS: 00007f8b537c36f0(0000) GS:ffffffff806afd40(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 0000000000000008 CR3: 0000000011c79000 CR4: 00000000000006e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process ip (pid: 1922, threadinfo ffff8100101d4000, task ffff81003d698be0)
Stack: ffff81003d49a740 0000000000000074 0000000000000028 ffff000880340560
ffff81003d49a740 ffff81003d49a800 ffff81003d49a740 0000000000001002
0000000000000000 ffff81003d49a748 ffff81003d49a000 ffffffff803c2971
Call Trace:
[<ffffffff803c2971>] tg3_open+0x29b/0x5ee
[<ffffffff80317c24>] selinux_capable+0x87/0x90
[<ffffffff8048661b>] dev_open+0x6c/0xa0
[<ffffffff80485131>] dev_change_flags+0xa6/0x15d
[<ffffffff804c4826>] devinet_ioctl+0x243/0x5a1
[<ffffffff80278a9b>] handle_mm_fault+0x32b/0x6a5
[<ffffffff804795d0>] sock_ioctl+0x1d4/0x1f8
[<ffffffff8029eb51>] vfs_ioctl+0x21/0x6b
[<ffffffff8029edf7>] do_vfs_ioctl+0x25c/0x275
[<ffffffff8029ee61>] sys_ioctl+0x51/0x70
[<ffffffff8020bd0b>] system_call_after_swapgs+0x7b/0x80
Code: ef e8 63 a0 ff ff 8b 85 88 07 00 00 a8 20 0f 84 06 01 00 00 a9 00 00 01 08 0f 85 fb 00 00 00 48 8b 8d 48 0b 00 00 be 00 54 00 00 <48> 8b 51 08 8b 42 04 48 83 c2 0c 0f c8 89 04 24 8b 01 b9 00 40
RIP [<ffffffff803be0d0>] tg3_reset_hw+0xf48/0x154b
RSP <ffff8100101d5d38>
CR2: 0000000000000008
---[ end trace 9f49694bab0b33db ]---
Kernel panic - not syncing: Aiee, killing interrupt handler!
Pid: 1922, comm: ip Tainted: G D 2.6.26-rc7-next-20080624-autotest #1
Call Trace:
[<ffffffff8023366f>] panic+0x86/0x144
[<ffffffff80252f75>] kallsyms_lookup+0x49/0x80
[<ffffffff803be0d0>] tg3_reset_hw+0xf48/0x154b
[<ffffffff802341e2>] printk+0x4e/0x56
[<ffffffff802341e2>] printk+0x4e/0x56
[<ffffffff80236764>] do_exit+0x71/0x67c
[<ffffffff804fdc71>] oops_begin+0x0/0x8c
[<ffffffff804ffb84>] do_page_fault+0x77b/0x834
[<ffffffff804fd8b9>] error_exit+0x0/0x51
[<ffffffff8047754d>] pci_conf1_write+0x0/0xdb
[<ffffffff803be0d0>] tg3_reset_hw+0xf48/0x154b
[<ffffffff803bdf9b>] tg3_reset_hw+0xe13/0x154b
[<ffffffff803c2971>] tg3_open+0x29b/0x5ee
[<ffffffff80317c24>] selinux_capable+0x87/0x90
[<ffffffff8048661b>] dev_open+0x6c/0xa0
[<ffffffff80485131>] dev_change_flags+0xa6/0x15d
[<ffffffff804c4826>] devinet_ioctl+0x243/0x5a1
[<ffffffff80278a9b>] handle_mm_fault+0x32b/0x6a5
[<ffffffff804795d0>] sock_ioctl+0x1d4/0x1f8
[<ffffffff8029eb51>] vfs_ioctl+0x21/0x6b
[<ffffffff8029edf7>] do_vfs_ioctl+0x25c/0x275
[<ffffffff8029ee61>] sys_ioctl+0x51/0x70
[<ffffffff8020bd0b>] system_call_after_swapgs+0x7b/0x80
BUG: unable to handle kernel NULL pointer dereference at 0000000000000008
IP: [<ffffffff803db3e1>] tg3_reset_hw+0xfc2/0x1559
PGD 17ff33067 PUD 17ee89067 PMD 0
Oops: 0000 [1] SMP
last sysfs file: /sys/devices/pci0000:00/0000:00:0a.0/0000:02:04.0/host0/target0:0:6/0:0:6:0/type
CPU 2
Modules linked in:
Pid: 2111, comm: ifconfig Not tainted 2.6.26-rc7-next-20080624-autotest #1
RIP: 0010:[<ffffffff803db3e1>] [<ffffffff803db3e1>] tg3_reset_hw+0xfc2/0x1559
RSP: 0000:ffff8101fe6dbbd8 EFLAGS: 00010246
RAX: 0000000000000000 RBX: 00000000000003fe RCX: 0000000000001002
RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000
RBP: ffff81007ee146c0 R08: 0000000000000002 R09: 0000000000000008
R10: 0000000000000010 R11: ffffffff80427969 R12: 0000000000005000
R13: 0000000000000000 R14: ffff8100e3136800 R15: ffff81007ee14000
FS: 0000000000000000(0000) GS:ffff81017ff0f000(0063) knlGS:00000000f7ddb460
CS: 0010 DS: 002b ES: 002b CR0: 000000008005003b
CR2: 0000000000000008 CR3: 000000017f3bb000 CR4: 00000000000006e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process ifconfig (pid: 2111, threadinfo ffff8101fe6da000, task ffff8100e2cb37a0)
Stack: 0000000000000000 000881007ee146c0 000000000000004c ffffffff80365680
ffff81007ee146c0 0000000000000074 0000000000000028 ffff81007ee146c0
0000000000000001 0000000000000000 0000000000000000 ffffffff803db9ab
Call Trace:
[<ffffffff80365680>] __delay+0x1c/0x41
[<ffffffff803db9ab>] tg3_init_hw+0x33/0x38
[<ffffffff803dbee6>] tg3_open+0x29e/0x600
[<ffffffff80438556>] dev_open+0x73/0xac
[<ffffffff80438bf9>] dev_change_flags+0xa3/0x15b
[<ffffffff8046e17e>] devinet_ioctl+0x288/0x5d8
[<ffffffff8046fc7f>] inet_ioctl+0x8f/0xa7
[<ffffffff8042ce22>] sock_ioctl+0x0/0x19c
[<ffffffff8042cf9a>] sock_ioctl+0x178/0x19c
[<ffffffff8028b899>] vfs_ioctl+0x29/0x6f
[<ffffffff8028bb2c>] do_vfs_ioctl+0x24d/0x25c
[<ffffffff8028bb77>] sys_ioctl+0x3c/0x61
[<ffffffff802ad2ae>] dev_ifsioc+0xdb/0x216
[<ffffffff802aeea3>] compat_sys_ioctl+0x2df/0x320
[<ffffffff8021e4cb>] do_page_fault+0x44c/0x7fe
[<ffffffff8042c696>] sock_map_fd+0x44/0x4b
[<ffffffff8036305d>] __up_read+0x10/0x96
[<ffffffff802226d2>] ia32_sysret+0x0/0xa
Code: 4a 01 00 00 31 c0 81 e2 00 00 01 08 0f 85 34 01 00 00 48 8b bd c8 0a 00 00 8b 8d cc 07 00 00 41 bc 00 50 00 00 8b b5 d0 0a 00 00 <48> 8b 57 08 c1 e9 0c 8b 42 04 48 83 c2 0c 0f c8 89 44 24 10 8b
RIP [<ffffffff803db3e1>] tg3_reset_hw+0xfc2/0x1559
RSP <ffff8101fe6dbbd8>
CR2: 0000000000000008
---[ end trace c1b9eba54c29dd60 ]---
Kernel panic - not syncing: Aiee, killing interrupt handler!
Pid: 2111, comm: ifconfig Tainted: G D 2.6.26-rc7-next-20080624-autotest #1
Call Trace:
[<ffffffff8022fa37>] panic+0xc4/0x181
[<ffffffff80230ac3>] printk+0x8d/0x95
[<ffffffff802325a2>] do_exit+0x1d8/0x65f
[<ffffffff8020cd8c>] __die+0x0/0xd7
[<ffffffff8021e7d4>] do_page_fault+0x755/0x7fe
[<ffffffff804ad9c9>] error_exit+0x0/0x51
[<ffffffff80427969>] pci_conf1_write+0x0/0xd2
[<ffffffff803db3e1>] tg3_reset_hw+0xfc2/0x1559
[<ffffffff803db25f>] tg3_reset_hw+0xe40/0x1559
[<ffffffff80365680>] __delay+0x1c/0x41
[<ffffffff803db9ab>] tg3_init_hw+0x33/0x38
[<ffffffff803dbee6>] tg3_open+0x29e/0x600
[<ffffffff80438556>] dev_open+0x73/0xac
[<ffffffff80438bf9>] dev_change_flags+0xa3/0x15b
[<ffffffff8046e17e>] devinet_ioctl+0x288/0x5d8
[<ffffffff8046fc7f>] inet_ioctl+0x8f/0xa7
[<ffffffff8042ce22>] sock_ioctl+0x0/0x19c
[<ffffffff8042cf9a>] sock_ioctl+0x178/0x19c
[<ffffffff8028b899>] vfs_ioctl+0x29/0x6f
[<ffffffff8028bb2c>] do_vfs_ioctl+0x24d/0x25c
[<ffffffff8028bb77>] sys_ioctl+0x3c/0x61
[<ffffffff802ad2ae>] dev_ifsioc+0xdb/0x216
[<ffffffff802aeea3>] compat_sys_ioctl+0x2df/0x320
[<ffffffff8021e4cb>] do_page_fault+0x44c/0x7fe
[<ffffffff8042c696>] sock_map_fd+0x44/0x4b
[<ffffffff8036305d>] __up_read+0x10/0x96
[<ffffffff802226d2>] ia32_sysret+0x0/0xa
--
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.
Hi Stephen,
allyesconfig kernel build on next-20080624, fails due to missing files
CHK include/linux/compile.h
make[4]: *** No rule to make target `drivers/media/dvb/dvb-usb/anysee.o', needed by `drivers/media/dvb/dvb-usb/dvb-usb.o'. Stop.
make[3]: *** [drivers/media/dvb/dvb-usb] Error 2
make[2]: *** [drivers/media/dvb] Error 2
make[1]: *** [drivers/media] Error 2
make: *** [drivers] Error 2
CC drivers/media/dvb/frontends/cx22702.o
make[4]: *** No rule to make target `drivers/media/dvb/frontends/drx397xD.o', needed by `drivers/media/dvb/frontends/built-in.o'. Stop.
make[3]: *** [drivers/media/dvb/frontends] Error 2
make[2]: *** [drivers/media/dvb] Error 2
make[1]: *** [drivers/media] Error 2
make: *** [drivers] Error 2
drivers/media/video/em28xx/em28xx-dvb.c:30:22: error: drx397xD.h: No such file or directory
make[4]: *** [drivers/media/video/em28xx/em28xx-dvb.o] Error 1
make[3]: *** [drivers/media/video/em28xx] Error 2
make[2]: *** [drivers/media/video] Error 2
make[1]: *** [drivers/media] Error 2
make: *** [drivers] Error 2
--
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.
XFS shows 2 build problems today.
1. xfs_stats.h problem
CC fs/xfs/xfs_rtalloc.o
In file included from /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_linux.h:91,
from /local/linsrc/linux-next-20080624/fs/xfs/xfs.h:44,
from /local/linsrc/linux-next-20080624/fs/xfs/xfs_rtalloc.c:18:
/local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_stats.h: In function 'xfs_init_procfs':
/local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_stats.h:150: error: expected ';' before '}' token
make[3]: *** [fs/xfs/xfs_rtalloc.o] Error 1
2. ACL's undefined
CC fs/xfs/linux-2.6/xfs_xattr.o
/local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c: In function 'xfs_decode_acl':
/local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: '_ACL_TYPE_ACCESS' undeclared (first use in this function)
/local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: (Each undeclared identifier is reported only once
/local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: for each function it appears in.)
/local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:42: error: '_ACL_TYPE_DEFAULT' undeclared (first use in this function)
make[3]: *** [fs/xfs/linux-2.6/xfs_xattr.o] Error 1
These happened multiple times. .configs are available if needed.
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
ivtv-ioctl.c uses struct fields that are protected by
CONFIG_VIDEO_ADV_DEBUG even when that config option is not set, causing:
build-r2146.out:/local/linsrc/linux-next-20080624/drivers/media/video/ivtv/ivtv-ioc
tl.c:1899: error: 'struct video_device' has no member named 'vidioc_g_register'
build-r2146.out:/local/linsrc/linux-next-20080624/drivers/media/video/ivtv/ivtv-ioc
tl.c:1900: error: 'struct video_device' has no member named 'vidioc_s_register'
build-r2146.out:make[5]: *** [drivers/media/video/ivtv/ivtv-ioctl.o] Error 1
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
On Tue, Jun 24, 2008 at 05:18:09PM -0700, Randy Dunlap wrote:
> XFS shows 2 build problems today.
>
> 1. xfs_stats.h problem
>
> CC fs/xfs/xfs_rtalloc.o
> In file included from /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_linux.h:91,
> from /local/linsrc/linux-next-20080624/fs/xfs/xfs.h:44,
> from /local/linsrc/linux-next-20080624/fs/xfs/xfs_rtalloc.c:18:
> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_stats.h: In function 'xfs_init_procfs':
> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_stats.h:150: error: expected ';' before '}' token
> make[3]: *** [fs/xfs/xfs_rtalloc.o] Error 1
This will be a !CONFIG_PROC_FS change.
Lachlan/Niv - This is the guilty party:
http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs/xfs-2.6.git;a=commit;h=e0fe783155e4f1c7106f3579c258b9f995330c19
The commit log is:
[XFS]
SGI-PV: 111111
SGI-Modid: xfs-linux-melb:xfs-kern:31210a
Signed-off-by: Niv Sardi <[email protected]>
Signed-off-by: Lachlan McIlroy <[email protected]>
---
What the hell happened here? Where's the commit title, description
so this can be tracked back to a real patch? That PV# is also bogus....
I suspect that it is this patch:
http://oss.sgi.com/archives/xfs/2008-05/msg00322.html
Which means that the Signed-Off-By list is incorrect as well as the original
patch came from Christoph. This can't go to mainline like this - the commit log
needs to be fixed up.
> 2. ACL's undefined
>
> CC fs/xfs/linux-2.6/xfs_xattr.o
> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c: In function 'xfs_decode_acl':
> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: '_ACL_TYPE_ACCESS' undeclared (first use in this function)
> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: (Each undeclared identifier is reported only once
> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: for each function it appears in.)
> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:42: error: '_ACL_TYPE_DEFAULT' undeclared (first use in this function)
> make[3]: *** [fs/xfs/linux-2.6/xfs_xattr.o] Error 1
And this will be a !CONFIG_XFS_POSIX_ACL build, I think.
Christoph - this is part of your change to use the generic ACL stuff,
can you have a look?
Cheers,
Dave.
--
Dave Chinner
[email protected]
Dave Chinner wrote:
> On Tue, Jun 24, 2008 at 05:18:09PM -0700, Randy Dunlap wrote:
>> XFS shows 2 build problems today.
>>
>> 1. xfs_stats.h problem
>>
>> CC fs/xfs/xfs_rtalloc.o
>> In file included from /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_linux.h:91,
>> from /local/linsrc/linux-next-20080624/fs/xfs/xfs.h:44,
>> from /local/linsrc/linux-next-20080624/fs/xfs/xfs_rtalloc.c:18:
>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_stats.h: In function 'xfs_init_procfs':
>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_stats.h:150: error: expected ';' before '}' token
>> make[3]: *** [fs/xfs/xfs_rtalloc.o] Error 1
>
> This will be a !CONFIG_PROC_FS change.
>
> Lachlan/Niv - This is the guilty party:
>
> http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs/xfs-2.6.git;a=commit;h=e0fe783155e4f1c7106f3579c258b9f995330c19
>
> The commit log is:
>
> [XFS]
>
> SGI-PV: 111111
> SGI-Modid: xfs-linux-melb:xfs-kern:31210a
>
> Signed-off-by: Niv Sardi <[email protected]>
> Signed-off-by: Lachlan McIlroy <[email protected]>
> ---
>
> What the hell happened here? Where's the commit title, description
> so this can be tracked back to a real patch? That PV# is also bogus....
tcsh> p_modinfo -h xfs-linux-melb:xfs-kern:31210a
mod xfs-linux-melb:xfs-kern:31210a header
==========================================
- SM_Location: longdrop.melbourne.sgi.com:/isms/linux/2.6.x-xfs-melb
- Workarea: itchy.melbourne.sgi.com:/home/xaiki/Wrk/git/pmod2git
- xfs-linux-melb:xfs-kern:31210a 05/21/08
- PV Incidents affected:
- Inspected by:
- Description:
- Files affected: xfs_da_btree.c 1.179, xfs_vfsops.c 1.567,
xfs_mount.h 1.269, xfs_error.c 1.60, xfs_error.h 1.49,
support/uuid.h 1.13, support/uuid.c 1.21,
linux-2.6/xfs_stats.c 1.23, linux-2.6/xfs_stats.h 1.15,
linux-2.6/xfs_super.c 1.428, linux-2.6/xfs_sysctl.c 1.43,
linux-2.6/xfs_sysctl.h 1.28, xfs_mru_cache.c 1.6,
xfs_filestream.c 1.5
- Author: xaiki
Well there wasn't much in the ptools checkin either.
No pv, inspected-by or description. One for Niv...
>
> I suspect that it is this patch:
>
> http://oss.sgi.com/archives/xfs/2008-05/msg00322.html
>
> Which means that the Signed-Off-By list is incorrect as well as the original
> patch came from Christoph. This can't go to mainline like this - the commit log
> needs to be fixed up.
>
The signed-off, because there was no description or inspected-by, would just fall back
to the author and who checked it in.
The ptools checkin was stuffed.
>> 2. ACL's undefined
>>
>> CC fs/xfs/linux-2.6/xfs_xattr.o
>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c: In function 'xfs_decode_acl':
>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: '_ACL_TYPE_ACCESS' undeclared (first use in this function)
>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: (Each undeclared identifier is reported only once
>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: for each function it appears in.)
>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:42: error: '_ACL_TYPE_DEFAULT' undeclared (first use in this function)
>> make[3]: *** [fs/xfs/linux-2.6/xfs_xattr.o] Error 1
>
> And this will be a !CONFIG_XFS_POSIX_ACL build, I think.
>
Yep. I didn't test the hch patch without CONFIG_XFS_POSIX_ACL. Oops.
xfs_acl.h:
#ifdef CONFIG_XFS_POSIX_ACL
...
#define _ACL_TYPE_ACCESS 1
#define _ACL_TYPE_DEFAULT 2
...
#endif
There is a bunch of ACL code in linux-2.6/xfs_xattr.c.
Possibly we could just modify xfs_acl.h as I think most other calls
have the non CONFIG'ed versions.
I'll have a look.
> Christoph - this is part of your change to use the generic ACL stuff,
> can you have a look?
>
--Tim
Timothy Shimmin wrote:
>>> 2. ACL's undefined
>>>
>>> CC fs/xfs/linux-2.6/xfs_xattr.o
>>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c: In function 'xfs_decode_acl':
>>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: '_ACL_TYPE_ACCESS' undeclared (first use in this function)
>>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: (Each undeclared identifier is reported only once
>>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: for each function it appears in.)
>>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:42: error: '_ACL_TYPE_DEFAULT' undeclared (first use in this function)
>>> make[3]: *** [fs/xfs/linux-2.6/xfs_xattr.o] Error 1
>> And this will be a !CONFIG_XFS_POSIX_ACL build, I think.
>>
> Yep. I didn't test the hch patch without CONFIG_XFS_POSIX_ACL. Oops.
>
> xfs_acl.h:
>
> #ifdef CONFIG_XFS_POSIX_ACL
> ...
> #define _ACL_TYPE_ACCESS 1
> #define _ACL_TYPE_DEFAULT 2
> ...
> #endif
>
> There is a bunch of ACL code in linux-2.6/xfs_xattr.c.
> Possibly we could just modify xfs_acl.h as I think most other calls
> have the non CONFIG'ed versions.
> I'll have a look.
>
So we could move up the acl defines in xfs_acl.h.
Unless Christoph wants some other rearrangement...
Index: 2.6.x-xfs-quilt/fs/xfs/xfs_acl.h
===================================================================
--- 2.6.x-xfs-quilt.orig/fs/xfs/xfs_acl.h 2008-06-25 10:46:42.000000000 +1000
+++ 2.6.x-xfs-quilt/fs/xfs/xfs_acl.h 2008-06-25 11:45:25.221045485 +1000
@@ -46,6 +46,8 @@ typedef struct xfs_acl {
#define SGI_ACL_FILE_SIZE (sizeof(SGI_ACL_FILE)-1)
#define SGI_ACL_DEFAULT_SIZE (sizeof(SGI_ACL_DEFAULT)-1)
+#define _ACL_TYPE_ACCESS 1
+#define _ACL_TYPE_DEFAULT 2
#ifdef CONFIG_XFS_POSIX_ACL
@@ -66,8 +68,6 @@ extern int xfs_acl_vset(bhv_vnode_t *, v
extern int xfs_acl_vget(bhv_vnode_t *, void *, size_t, int);
extern int xfs_acl_vremove(bhv_vnode_t *, int);
-#define _ACL_TYPE_ACCESS 1
-#define _ACL_TYPE_DEFAULT 2
#define _ACL_PERM_INVALID(perm) ((perm) & ~(ACL_READ|ACL_WRITE|ACL_EXECUTE))
#define _ACL_INHERIT(c,m,d) (xfs_acl_inherit(c,m,d))
Dave Chinner wrote:
> On Tue, Jun 24, 2008 at 05:18:09PM -0700, Randy Dunlap wrote:
>> XFS shows 2 build problems today.
>>
>> 1. xfs_stats.h problem
>>
>> CC fs/xfs/xfs_rtalloc.o
>> In file included from /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_linux.h:91,
>> from /local/linsrc/linux-next-20080624/fs/xfs/xfs.h:44,
>> from /local/linsrc/linux-next-20080624/fs/xfs/xfs_rtalloc.c:18:
>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_stats.h: In function 'xfs_init_procfs':
>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_stats.h:150: error: expected ';' before '}' token
>> make[3]: *** [fs/xfs/xfs_rtalloc.o] Error 1
>
> This will be a !CONFIG_PROC_FS change.
>
> Lachlan/Niv - This is the guilty party:
>
> http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs/xfs-2.6.git;a=commit;h=e0fe783155e4f1c7106f3579c258b9f995330c19
>
> The commit log is:
>
> [XFS]
>
> SGI-PV: 111111
> SGI-Modid: xfs-linux-melb:xfs-kern:31210a
>
> Signed-off-by: Niv Sardi <[email protected]>
> Signed-off-by: Lachlan McIlroy <[email protected]>
> ---
>
> What the hell happened here? Where's the commit title, description
> so this can be tracked back to a real patch? That PV# is also bogus....
>
> I suspect that it is this patch:
>
> http://oss.sgi.com/archives/xfs/2008-05/msg00322.html
>
> Which means that the Signed-Off-By list is incorrect as well as the original
> patch came from Christoph. This can't go to mainline like this - the commit log
> needs to be fixed up.
We knew this checkin was stuffed up and I was planning to fix it in the for-linus
branch before pushing to mainline. The merge tools had kittens when it came across
it too. I think we need to rip it out of ptools and re-checkin it in with the
correct details.
>
>> 2. ACL's undefined
>>
>> CC fs/xfs/linux-2.6/xfs_xattr.o
>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c: In function 'xfs_decode_acl':
>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: '_ACL_TYPE_ACCESS' undeclared (first use in this function)
>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: (Each undeclared identifier is reported only once
>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:40: error: for each function it appears in.)
>> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_xattr.c:42: error: '_ACL_TYPE_DEFAULT' undeclared (first use in this function)
>> make[3]: *** [fs/xfs/linux-2.6/xfs_xattr.o] Error 1
>
> And this will be a !CONFIG_XFS_POSIX_ACL build, I think.
>
> Christoph - this is part of your change to use the generic ACL stuff,
> can you have a look?
>
> Cheers,
>
> Dave.
Hi Mauro,
On Tue, 24 Jun 2008 23:23:56 +0530 Kamalesh Babulal <[email protected]> wrote:
>
> allyesconfig kernel build on next-20080624, fails due to missing files
>
> drivers/media/video/em28xx/em28xx-dvb.c:30:22: error: drx397xD.h: No such file or directory
To fix this, I have reverted commit
969ff74e0ab707801150dc83eb254794bc574442 ("V4L/DVB (8006): em28xx: Split
HVR900 into two separate entries") from linux-next for today.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
Hi Kamalesh,
On Tue, 24 Jun 2008 23:23:56 +0530 Kamalesh Babulal <[email protected]> wrote:
>
> allyesconfig kernel build on next-20080624, fails due to missing files
>
> CHK include/linux/compile.h
> make[4]: *** No rule to make target `drivers/media/dvb/dvb-usb/anysee.o', needed by `drivers/media/dvb/dvb-usb/dvb-usb.o'. Stop.
>
> CC drivers/media/dvb/frontends/cx22702.o
> make[4]: *** No rule to make target `drivers/media/dvb/frontends/drx397xD.o', needed by `drivers/media/dvb/frontends/built-in.o'. Stop.
I am pretty sure that these were caused by me stuffing up the merging of
the v4l-dvb tree yesterday. It should be OK today.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Wed, Jun 25, 2008 at 12:01:15PM +1000, Lachlan McIlroy wrote:
> Dave Chinner wrote:
> > On Tue, Jun 24, 2008 at 05:18:09PM -0700, Randy Dunlap wrote:
> >> XFS shows 2 build problems today.
> >>
> >> 1. xfs_stats.h problem
> >>
> >> CC fs/xfs/xfs_rtalloc.o
> >> In file included from /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_linux.h:91,
> >> from /local/linsrc/linux-next-20080624/fs/xfs/xfs.h:44,
> >> from /local/linsrc/linux-next-20080624/fs/xfs/xfs_rtalloc.c:18:
> >> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_stats.h: In function 'xfs_init_procfs':
> >> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_stats.h:150: error: expected ';' before '}' token
> >> make[3]: *** [fs/xfs/xfs_rtalloc.o] Error 1
> >
> > This will be a !CONFIG_PROC_FS change.
> >
> > Lachlan/Niv - This is the guilty party:
> >
> > http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs/xfs-2.6.git;a=commit;h=e0fe783155e4f1c7106f3579c258b9f995330c19
> >
> > The commit log is:
> >
> > [XFS]
> >
> > SGI-PV: 111111
> > SGI-Modid: xfs-linux-melb:xfs-kern:31210a
> >
> > Signed-off-by: Niv Sardi <[email protected]>
> > Signed-off-by: Lachlan McIlroy <[email protected]>
> > ---
> >
> > What the hell happened here? Where's the commit title, description
> > so this can be tracked back to a real patch? That PV# is also bogus....
> >
> > I suspect that it is this patch:
> >
> > http://oss.sgi.com/archives/xfs/2008-05/msg00322.html
> >
> > Which means that the Signed-Off-By list is incorrect as well as the original
> > patch came from Christoph. This can't go to mainline like this - the commit log
> > needs to be fixed up.
>
> We knew this checkin was stuffed up and I was planning to fix it in the for-linus
> branch before pushing to mainline. The merge tools had kittens when it came across
> it too. I think we need to rip it out of ptools and re-checkin it in with the
> correct details.
It never should have made the merge in that state. Niv, I suggest
you stop using that broken script of yours to do checkins because you
do nothing but break stuff with it. Change logs like:
xiaki pmod2git xfs-linux-melb:xfs-kern:31210a
(http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_stats.h?f=h#rev1.18)
in the CVS tree and busted git logs make it just about impossible to
track where something came from.
Cheers,
Dave.
--
Dave Chinner
[email protected]
Hi Mauro,
On Wed, 25 Jun 2008 13:28:10 +1000 Stephen Rothwell <[email protected]> wrote:
>
> On Tue, 24 Jun 2008 23:23:56 +0530 Kamalesh Babulal <[email protected]> wrote:
> >
> > allyesconfig kernel build on next-20080624, fails due to missing files
> >
> > drivers/media/video/em28xx/em28xx-dvb.c:30:22: error: drx397xD.h: No such file or directory
>
> To fix this, I have reverted commit
> 969ff74e0ab707801150dc83eb254794bc574442 ("V4L/DVB (8006): em28xx: Split
> HVR900 into two separate entries") from linux-next for today.
Although, on reflection, this may have been caused by the mismerge
yesterday. I will leave it in tomorrow unless I am told otherwise.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Wednesday 25 June 2008 02:24:14 Randy Dunlap wrote:
> ivtv-ioctl.c uses struct fields that are protected by
> CONFIG_VIDEO_ADV_DEBUG even when that config option is not set,
> causing:
>
> build-r2146.out:/local/linsrc/linux-next-20080624/drivers/media/video
>/ivtv/ivtv-ioc tl.c:1899: error: 'struct video_device' has no member
> named 'vidioc_g_register'
> build-r2146.out:/local/linsrc/linux-next-20080624/drivers/media/video
>/ivtv/ivtv-ioc tl.c:1900: error: 'struct video_device' has no member
> named 'vidioc_s_register' build-r2146.out:make[5]: ***
> [drivers/media/video/ivtv/ivtv-ioctl.o] Error 1
>
>
> ---
> ~Randy
> Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
> http://linuxplumbersconf.org/
Hi Randy,
Thanks for the report. It's fixed in my tree and will find it's way
upstream soon.
Regards,
Hans
The patch looks good as an iterim fix. With the pending conversion
to the generic ACL code the handlers for the ACLs will move to xfs_acl.c
and solve this, too.
On Wed, 25 Jun 2008 11:52:40 +1000 Timothy Shimmin <[email protected]> wrote:
>
> So we could move up the acl defines in xfs_acl.h.
> Unless Christoph wants some other rearrangement...
>
> Index: 2.6.x-xfs-quilt/fs/xfs/xfs_acl.h
> ===================================================================
> --- 2.6.x-xfs-quilt.orig/fs/xfs/xfs_acl.h 2008-06-25 10:46:42.000000000 +1000
> +++ 2.6.x-xfs-quilt/fs/xfs/xfs_acl.h 2008-06-25 11:45:25.221045485 +1000
> @@ -46,6 +46,8 @@ typedef struct xfs_acl {
> #define SGI_ACL_FILE_SIZE (sizeof(SGI_ACL_FILE)-1)
> #define SGI_ACL_DEFAULT_SIZE (sizeof(SGI_ACL_DEFAULT)-1)
>
> +#define _ACL_TYPE_ACCESS 1
> +#define _ACL_TYPE_DEFAULT 2
>
> #ifdef CONFIG_XFS_POSIX_ACL
>
> @@ -66,8 +68,6 @@ extern int xfs_acl_vset(bhv_vnode_t *, v
> extern int xfs_acl_vget(bhv_vnode_t *, void *, size_t, int);
> extern int xfs_acl_vremove(bhv_vnode_t *, int);
>
> -#define _ACL_TYPE_ACCESS 1
> -#define _ACL_TYPE_DEFAULT 2
> #define _ACL_PERM_INVALID(perm) ((perm) & ~(ACL_READ|ACL_WRITE|ACL_EXECUTE))
>
> #define _ACL_INHERIT(c,m,d) (xfs_acl_inherit(c,m,d))
>
I have applied this to linux-next for today, please apply it (or
something similar) to the xfs tree soon.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Tue, Jun 24, 2008 at 05:18:09PM -0700, Randy Dunlap wrote:
> XFS shows 2 build problems today.
>
> 1. xfs_stats.h problem
>
> CC fs/xfs/xfs_rtalloc.o
> In file included from /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_linux.h:91,
> from /local/linsrc/linux-next-20080624/fs/xfs/xfs.h:44,
> from /local/linsrc/linux-next-20080624/fs/xfs/xfs_rtalloc.c:18:
> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_stats.h: In function 'xfs_init_procfs':
> /local/linsrc/linux-next-20080624/fs/xfs/linux-2.6/xfs_stats.h:150: error: expected ';' before '}' token
> make[3]: *** [fs/xfs/xfs_rtalloc.o] Error 1
This should fix the problem, although I can't find a way to drop
CONFIG_PROC_FS from my test config to actually verify it:
Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_stats.h
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/linux-2.6/xfs_stats.h 2008-06-27 15:16:21.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/linux-2.6/xfs_stats.h 2008-06-27 15:19:18.000000000 +0200
@@ -146,11 +146,12 @@ extern void xfs_cleanup_procfs(void);
static inline int xfs_init_procfs(void)
{
- return 0
-};
+ return 0;
+}
+
static inline void xfs_cleanup_procfs(void)
{
-};
+}
#endif /* !CONFIG_PROC_FS */
On Wed, Jun 25, 2008 at 10:37:51AM +1000, Dave Chinner wrote:
> What the hell happened here? Where's the commit title, description
> so this can be tracked back to a real patch? That PV# is also bogus....
>
> I suspect that it is this patch:
>
> http://oss.sgi.com/archives/xfs/2008-05/msg00322.html
>
> Which means that the Signed-Off-By list is incorrect as well as the original
> patch came from Christoph. This can't go to mainline like this - the commit log
> needs to be fixed up.
The tree is still messed up. This original [XFS] commit is still there,
but also a revert of it. but no patch with the actual changes again (?)
Also my patch to switch to the generic xattr code is attributed to
Lachlan and appears twice in the commit list. I think this whole git
tree needs to be regenerated.
On Wed, 25 Jun 2008 13:48:59 +1000
Stephen Rothwell <[email protected]> wrote:
> Hi Mauro,
>
> On Wed, 25 Jun 2008 13:28:10 +1000 Stephen Rothwell <[email protected]> wrote:
> >
> > On Tue, 24 Jun 2008 23:23:56 +0530 Kamalesh Babulal <[email protected]> wrote:
> > >
> > > allyesconfig kernel build on next-20080624, fails due to missing files
> > >
> > > drivers/media/video/em28xx/em28xx-dvb.c:30:22: error: drx397xD.h: No such file or directory
> >
> > To fix this, I have reverted commit
> > 969ff74e0ab707801150dc83eb254794bc574442 ("V4L/DVB (8006): em28xx: Split
> > HVR900 into two separate entries") from linux-next for today.
>
> Although, on reflection, this may have been caused by the mismerge
> yesterday. I will leave it in tomorrow unless I am told otherwise.
Thanks for the report. I've fixed the two reported issues and now it should compile fine.
Cheers,
Mauro
On Sun, 29 Jun 2008 08:43:17 -0300 Mauro Carvalho Chehab <[email protected]> wrote:
>
> Thanks for the report. I've fixed the two reported issues and now it should compile fine.
Thanks, I look forward to tomorrow's build.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Fri, Jun 27, 2008 at 03:23:17PM +0200, Christoph Hellwig wrote:
>
> The tree is still messed up. This original [XFS] commit is still there,
> but also a revert of it. but no patch with the actual changes again (?)
>
> Also my patch to switch to the generic xattr code is attributed to
> Lachlan and appears twice in the commit list. I think this whole git
> tree needs to be regenerated.
Could this please get fixed before the 2.6.27 pull? The xfs.git tree
now has Linus' latest changes pulled but this still doesn't look
fixed up.
Christoph Hellwig wrote:
> On Fri, Jun 27, 2008 at 03:23:17PM +0200, Christoph Hellwig wrote:
>> The tree is still messed up. This original [XFS] commit is still there,
>> but also a revert of it. but no patch with the actual changes again (?)
>>
>> Also my patch to switch to the generic xattr code is attributed to
>> Lachlan and appears twice in the commit list. I think this whole git
>> tree needs to be regenerated.
>
> Could this please get fixed before the 2.6.27 pull? The xfs.git tree
> now has Linus' latest changes pulled but this still doesn't look
> fixed up.
Yep, I believe Lachlan is planning to regenerate the xfs git tree before
the pull request.
--Tim
On Thu, 17 Jul 2008 15:26:10 +1000 Timothy Shimmin <[email protected]> wrote:
>
> Christoph Hellwig wrote:
> > On Fri, Jun 27, 2008 at 03:23:17PM +0200, Christoph Hellwig wrote:
> >> The tree is still messed up. This original [XFS] commit is still there,
> >> but also a revert of it. but no patch with the actual changes again (?)
> >>
> >> Also my patch to switch to the generic xattr code is attributed to
> >> Lachlan and appears twice in the commit list. I think this whole git
> >> tree needs to be regenerated.
> >
> > Could this please get fixed before the 2.6.27 pull? The xfs.git tree
> > now has Linus' latest changes pulled but this still doesn't look
> > fixed up.
>
> Yep, I believe Lachlan is planning to regenerate the xfs git tree before
> the pull request.
When that happens, could you please make sure that the linux-next tree is
updated as well ... I have had a couple of trees where what was merged to
Linus did not match what is in linux-next - and that causes me no end of
pain when I have to merge the two ...
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/