* linux-next: Tree for July 17
@ 2008-07-17 15:28 Stephen Rothwell
2008-07-17 22:21 ` linux-next: Tree for July 17 (sysctl/syscall) Randy Dunlap
` (2 more replies)
0 siblings, 3 replies; 13+ messages in thread
From: Stephen Rothwell @ 2008-07-17 15:28 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 15420 bytes --]
Hi all,
Changes since next-20080716:
Temporarily dropped tree: ttydev (it gets too many patch failures).
Changed trees: the security-testing tree was moved later in the merge in
anticipation of majo merge problems that have been delayed.
The vfs tree changed branch names.
Most of the differences were conflicts moving from tree to tree as some
of the trees are now merged into Linus' tree. Most have been inflicted
on the driver-core and usb trees. I have not notified these separately.
Because of the moving of conflicts around it is difficult to tell when
they are going away (though I assume some are).
The driver-core tree gained two build fixes from the scsi tree (since
that went into Linus' tree).
The usb tree gained a conflict from the firmware tree (ditto).
The x86 tree gained an expected conflict against the stackprotector and a
build failure that required a revert of a commit.
The pci tree needed another build fix patch.
The ide tree had more conflicts with its parts that have been merged into
Linus' tree.
The acpi had various merge problems - maybe because I am pulling a
different tree than what was merged into Linus' tree.
The galak tree gained a conflict against the net tree.
The ubifs tree also had merge problems because a different version was
sent to Linus.
I have also applied the following patches for known problems:
sparc64: sysdev API change fallout
This tree fails to build for ARCH=sparc (i.e. 32bit) with a 64bit gcc
v3.4.5 - it tries to use the 64bit header files. This may be an artifact
of one of my merge fixups, but I don't actually think so.
--
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 quilt/driver-core
CONFLICT (content): Merge conflict in arch/arm/kernel/time.c
CONFLICT (content): Merge conflict in arch/x86/kernel/traps_32.c
CONFLICT (content): Merge conflict in arch/x86/kernel/traps_64.c
CONFLICT (content): Merge conflict in drivers/base/topology.c
CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c
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
CONFLICT (content): Merge conflict in drivers/s390/net/netiucv.c
CONFLICT (content): Merge conflict in drivers/s390/scsi/zfcp_aux.c
CONFLICT (content): Merge conflict in drivers/s390/scsi/zfcp_def.h
CONFLICT (content): Merge conflict in sound/pci/maestro3.c
CONFLICT (content): Merge conflict in sound/pci/ymfpci/ymfpci_main.c
Applying scsi: fix fallout from the class_find_device API change
Applying scsi: fix fallout from KOBJ_NAME_LEN removal
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/gadget/ether.c
CONFLICT (delete/modify): drivers/usb/serial/io_fw_down3.h deleted in HEAD and modified in quilt/usb. Version quilt/usb of drivers/usb/serial/io_fw_down3.h left in tree.
CONFLICT (content): Merge conflict in drivers/usb/serial/io_ti.c
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_3410.h deleted in HEAD and modified in quilt/usb. Version quilt/usb of drivers/usb/serial/ti_fw_3410.h left in tree.
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_5052.h deleted in HEAD and modified in quilt/usb. Version quilt/usb of drivers/usb/serial/ti_fw_5052.h left in tree.
CONFLICT (content): Merge conflict in drivers/usb/serial/ti_usb_3410_5052.c
$ git reset --hard
$ git checkout -b tmp quilt/usb
Created commit 2546c30: Revert "USB: io_ti: FIrst cut at a big clean up"
$ git checkout master
CONFLICT (content): Merge conflict in drivers/usb/gadget/ether.c
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_3410.h deleted in HEAD and modified in tmp. Version tmp of drivers/usb/serial/ti_fw_3410.h left in tree.
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_5052.h deleted in HEAD and modified in tmp. Version tmp of drivers/usb/serial/ti_fw_5052.h left in tree.
CONFLICT (content): Merge conflict in drivers/usb/serial/ti_usb_3410_5052.c
$ git rm drivers/usb/serial/ti_fw_3410.h drivers/usb/serial/ti_fw_5052.h
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
CONFLICT (content): Merge conflict in drivers/acpi/processor_throttling.c
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/x86/kernel/Makefile
Created commit 9757c27: Revert "x86: consolidate header guards"
Merging pci/linux-next
CONFLICT (content): Merge conflict in arch/sparc64/kernel/pci.c
CONFLICT (delete/modify): arch/x86/kernel/setup_64.c deleted in HEAD and modified in pci/linux-next. Version pci/linux-next of arch/x86/kernel/setup_64.c left in tree.
CONFLICT (content): Merge conflict in arch/x86/pci/irq.c
CONFLICT (content): Merge conflict in arch/x86/pci/pci.h
CONFLICT (content): Merge conflict in drivers/acpi/sleep/main.c
CONFLICT (content): Merge conflict in drivers/pci/pci.c
CONFLICT (content): Merge conflict in drivers/pci/pci.h
CONFLICT (content): Merge conflict in include/acpi/acpi_bus.h
CONFLICT (content): Merge conflict in include/linux/device.h
Applying pci: usb fixup 1
Applying pci: fix xen fallout from PM API change
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/kernel-doc
Merging avr32/avr32-arch
Merging v4l-dvb/stable
Applying v4l-dvb: class_for_each_device API change fallout
Merging s390/features
Merging sh/master
Merging jfs/next
Merging kbuild/master
CONFLICT (content): Merge conflict in include/Kbuild
Created commit 03e7ffad: Revert "kconfig: normalize int/hex values"
Merging quilt/ide
CONFLICT (content): Merge conflict in drivers/ide/Kconfig
CONFLICT (content): Merge conflict in drivers/ide/arm/icside.c
CONFLICT (content): Merge conflict in drivers/ide/arm/palm_bk3710.c
CONFLICT (content): Merge conflict in drivers/ide/arm/rapide.c
CONFLICT (content): Merge conflict in drivers/ide/h8300/ide-h8300.c
CONFLICT (content): Merge conflict in drivers/ide/ide-pnp.c
CONFLICT (content): Merge conflict in drivers/ide/ide-probe.c
CONFLICT (content): Merge conflict in drivers/ide/ide.c
CONFLICT (content): Merge conflict in drivers/ide/legacy/buddha.c
CONFLICT (content): Merge conflict in drivers/ide/legacy/falconide.c
CONFLICT (content): Merge conflict in drivers/ide/legacy/gayle.c
CONFLICT (content): Merge conflict in drivers/ide/legacy/ide-4drives.c
CONFLICT (content): Merge conflict in drivers/ide/legacy/ide-cs.c
CONFLICT (content): Merge conflict in drivers/ide/legacy/ide_platform.c
CONFLICT (content): Merge conflict in drivers/ide/legacy/macide.c
CONFLICT (content): Merge conflict in drivers/ide/legacy/q40ide.c
CONFLICT (content): Merge conflict in drivers/ide/mips/au1xxx-ide.c
CONFLICT (content): Merge conflict in drivers/ide/mips/swarm.c
CONFLICT (content): Merge conflict in drivers/ide/pci/amd74xx.c
CONFLICT (content): Merge conflict in drivers/ide/pci/cmd640.c
CONFLICT (content): Merge conflict in drivers/ide/pci/cs5535.c
CONFLICT (content): Merge conflict in drivers/ide/pci/delkin_cb.c
CONFLICT (content): Merge conflict in drivers/ide/pci/scc_pata.c
CONFLICT (content): Merge conflict in drivers/ide/pci/sgiioc4.c
CONFLICT (content): Merge conflict in drivers/ide/pci/sis5513.c
CONFLICT (content): Merge conflict in drivers/ide/pci/via82cxxx.c
CONFLICT (content): Merge conflict in drivers/ide/ppc/pmac.c
CONFLICT (content): Merge conflict in drivers/ide/setup-pci.c
CONFLICT (content): Merge conflict in include/linux/ide.h
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
CONFLICT (rename/modify): Merge conflict in arch/x86/mm/srat_32.c
CONFLICT (content): Merge conflict in Documentation/ABI/testing/sysfs-firmware-acpi
CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/sleep.c
CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
CONFLICT (content): Merge conflict in drivers/acpi/executer/exdump.c
CONFLICT (content): Merge conflict in drivers/acpi/hardware/hwgpe.c
CONFLICT (content): Merge conflict in drivers/acpi/processor_throttling.c
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/acpi/sleep/main.c
CONFLICT (content): Merge conflict in drivers/acpi/system.c
CONFLICT (content): Merge conflict in drivers/acpi/video.c
CONFLICT (content): Merge conflict in drivers/char/apm-emulation.c
CONFLICT (content): Merge conflict in drivers/misc/Kconfig
CONFLICT (add/add): Merge conflict in drivers/misc/compal-laptop.c
CONFLICT (content): Merge conflict in drivers/misc/fujitsu-laptop.c
CONFLICT (content): Merge conflict in drivers/pci/pci.c
CONFLICT (content): Merge conflict in drivers/pci/pci.h
CONFLICT (content): Merge conflict in include/acpi/acconfig.h
CONFLICT (content): Merge conflict in include/acpi/acexcep.h
CONFLICT (content): Merge conflict in include/acpi/acmacros.h
CONFLICT (content): Merge conflict in include/acpi/acpi_bus.h
CONFLICT (content): Merge conflict in include/acpi/actbl1.h
CONFLICT (content): Merge conflict in include/acpi/actypes.h
CONFLICT (content): Merge conflict in include/linux/ioport.h
Merging blackfin/for-linus
Merging nfsd/nfsd-next
CONFLICT (content): Merge conflict in net/sunrpc/svc.c
Merging ieee1394/for-next
Merging hwmon/testing
Merging ubi/master
Merging kvm/master
CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c
CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c
Merging dlm/next
Merging scsi/master
Merging ia64/test
Merging tests/master
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging ocfs2/linux-next
Merging quilt/m68k
Merging powerpc/next
Merging lblnet/master
Merging ext4/next
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt
CONFLICT (content): Merge conflict in drivers/atm/Makefile
CONFLICT (content): Merge conflict in drivers/net/fs_enet/fs_enet-main.c
CONFLICT (content): Merge conflict in drivers/pci/pci-acpi.c
CONFLICT (content): Merge conflict in net/8021q/vlan.c
CONFLICT (content): Merge conflict in net/iucv/iucv.c
Merging sparc/master
CONFLICT (content): Merge conflict in include/asm-sparc/ide.h
CONFLICT (content): Merge conflict in include/asm-sparc/smp.h
CONFLICT (content): Merge conflict in include/asm-sparc64/ide.h
CONFLICT (content): Merge conflict in include/asm-sparc64/mmu.h
CONFLICT (content): Merge conflict in include/asm-sparc64/page.h
CONFLICT (content): Merge conflict in include/asm-sparc64/pgtable.h
Merging galak/powerpc-next
CONFLICT (content): Merge conflict in drivers/net/fs_enet/fs_enet-main.c
Merging mtd/master
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-yl-9200.c
CONFLICT (delete/modify): drivers/mtd/maps/mtx-1_flash.c deleted in HEAD and modified in mtd/master. Version mtd/master of drivers/mtd/maps/mtx-1_flash.c left in tree.
$ git rm drivers/mtd/maps/mtx-1_flash.c
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/master
Merging arm/devel
CONFLICT (rename/delete): Renamed arch/arm/configs/em_x270_defconfig->arch/sh/configs/sh7763rdp_defconfig in HEAD and deleted in arm/devel
Merging cpufreq/next
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c
Merging v9fs/for-next
Merging quilt/rr
CONFLICT (content): Merge conflict in drivers/char/hvc_console.h
CONFLICT (content): Merge conflict in drivers/net/tun.c
CONFLICT (content): Merge conflict in include/linux/if_tun.h
CONFLICT (content): Merge conflict in kernel/stop_machine.c
CONFLICT (content): Merge conflict in kernel/sysctl.c
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
CONFLICT (content): Merge conflict in include/asm-sparc64/semaphore.h
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
CONFLICT (content): Merge conflict in include/linux/securebits.h
Merging ubifs/for_andrew
CONFLICT (add/add): Merge conflict in fs/ubifs/budget.c
CONFLICT (add/add): Merge conflict in fs/ubifs/debug.c
CONFLICT (add/add): Merge conflict in fs/ubifs/dir.c
CONFLICT (add/add): Merge conflict in fs/ubifs/file.c
CONFLICT (add/add): Merge conflict in fs/ubifs/io.c
CONFLICT (add/add): Merge conflict in fs/ubifs/journal.c
CONFLICT (add/add): Merge conflict in fs/ubifs/shrinker.c
CONFLICT (add/add): Merge conflict in fs/ubifs/tnc.c
CONFLICT (add/add): Merge conflict in fs/ubifs/xattr.c
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile
Merging pcmcia/master
Merging battery/master
CONFLICT (content): Merge conflict in drivers/power/Kconfig
CONFLICT (content): Merge conflict in drivers/power/Makefile
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging m68knommu/for-next
Merging uclinux/for-next
Merging md/for-next
Merging cris/for-next
Merging kmemcheck/auto-kmemcheck-next
Merging generic-ipi/auto-generic-ipi-next
Merging mips/mips-for-linux-next
Merging mfd/for-next
Merging hdlc/hdlc-next
CONFLICT (content): Merge conflict in drivers/net/wan/cosa.c
CONFLICT (content): Merge conflict in drivers/net/wan/hdlc_fr.c
CONFLICT (content): Merge conflict in drivers/net/wan/pc300_drv.c
Merging drm/drm-next
CONFLICT (add/add): Merge conflict in drivers/gpu/Makefile
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i830/Makefile
CONFLICT (content): Merge conflict in include/Kbuild
CONFLICT (add/add): Merge conflict in include/drm/Kbuild
Merging voltage/reg-for-linus
Merging security-testing/next
Applying sparc64: sysdev API change fallout
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for July 17 (sysctl/syscall)
2008-07-17 15:28 linux-next: Tree for July 17 Stephen Rothwell
@ 2008-07-17 22:21 ` Randy Dunlap
2008-07-17 22:34 ` linux-next: Tree for July 17 (net_namespace) Randy Dunlap
2008-07-17 23:06 ` linux-next: Tree for July 17: early crash on x86-64 Rafael J. Wysocki
2 siblings, 0 replies; 13+ messages in thread
From: Randy Dunlap @ 2008-07-17 22:21 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
Who is making patches to kernel/sysctl.c ?
With
CONFIG_SYSCTL=y
# CONFIG_SYSCTL_SYSCALL is not set
linux-next-20080717 produces:
linux-next-20080717/kernel/sysctl.c:2970: error: redefinition of 'setup_sysctl_set'
linux-next-20080717/kernel/sysctl.c:1963: error: previous definition of 'setup_sysctl_set' was here
because one definition of it is bounded by CONFIG_SYSCTL and another definition
of it is bounded by CONFIG_SYSCTL_SYSCALL... :(
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for July 17 (net_namespace)
2008-07-17 15:28 linux-next: Tree for July 17 Stephen Rothwell
2008-07-17 22:21 ` linux-next: Tree for July 17 (sysctl/syscall) Randy Dunlap
@ 2008-07-17 22:34 ` Randy Dunlap
2008-07-17 23:06 ` linux-next: Tree for July 17: early crash on x86-64 Rafael J. Wysocki
2 siblings, 0 replies; 13+ messages in thread
From: Randy Dunlap @ 2008-07-17 22:34 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
With PROC_FS=n, PROC_SYSCTL=n, SYSCTL_SYSCALL=n, the <sysctls> field of
struct net in include/net/net_namespace.h has problems:
In file included from /local/linsrc/linux-next-20080717/include/linux/init_task.h:12,
from /local/linsrc/linux-next-20080717/kernel/pid.c:37:
/local/linsrc/linux-next-20080717/include/net/net_namespace.h:40: error: field 'sysctls' has incomplete type
In file included from /local/linsrc/linux-next-20080717/include/linux/netdevice.h:44,
from /local/linsrc/linux-next-20080717/include/linux/if_bridge.h:105,
from /local/linsrc/linux-next-20080717/fs/compat_ioctl.c:24:
/local/linsrc/linux-next-20080717/include/net/net_namespace.h:40: error: field 'sysctls' has incomplete type
In file included from /local/linsrc/linux-next-20080717/include/linux/init_task.h:12,
from /local/linsrc/linux-next-20080717/arch/x86/kernel/init_task.c:5:
/local/linsrc/linux-next-20080717/include/net/net_namespace.h:40: error: field 'sysctls' has incomplete type
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for July 17: early crash on x86-64
2008-07-17 15:28 linux-next: Tree for July 17 Stephen Rothwell
2008-07-17 22:21 ` linux-next: Tree for July 17 (sysctl/syscall) Randy Dunlap
2008-07-17 22:34 ` linux-next: Tree for July 17 (net_namespace) Randy Dunlap
@ 2008-07-17 23:06 ` Rafael J. Wysocki
2008-07-18 13:52 ` Alexander Beregalov
2 siblings, 1 reply; 13+ messages in thread
From: Rafael J. Wysocki @ 2008-07-17 23:06 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Ingo Molnar, Kernel Testers List
On Thursday, 17 of July 2008, Stephen Rothwell wrote:
> Hi all,
>
> Changes since next-20080716:
>
> Temporarily dropped tree: ttydev (it gets too many patch failures).
>
> Changed trees: the security-testing tree was moved later in the merge in
> anticipation of majo merge problems that have been delayed.
> The vfs tree changed branch names.
>
> Most of the differences were conflicts moving from tree to tree as some
> of the trees are now merged into Linus' tree. Most have been inflicted
> on the driver-core and usb trees. I have not notified these separately.
>
> Because of the moving of conflicts around it is difficult to tell when
> they are going away (though I assume some are).
>
> The driver-core tree gained two build fixes from the scsi tree (since
> that went into Linus' tree).
>
> The usb tree gained a conflict from the firmware tree (ditto).
>
> The x86 tree gained an expected conflict against the stackprotector and a
> build failure that required a revert of a commit.
>
> The pci tree needed another build fix patch.
>
> The ide tree had more conflicts with its parts that have been merged into
> Linus' tree.
>
> The acpi had various merge problems - maybe because I am pulling a
> different tree than what was merged into Linus' tree.
>
> The galak tree gained a conflict against the net tree.
>
> The ubifs tree also had merge problems because a different version was
> sent to Linus.
>
> I have also applied the following patches for known problems:
>
> sparc64: sysdev API change fallout
>
> This tree fails to build for ARCH=sparc (i.e. 32bit) with a 64bit gcc
> v3.4.5 - it tries to use the 64bit header files. This may be an artifact
> of one of my merge fixups, but I don't actually think so.
This one crashes all of my x86-64 test boxes early during boot.
The Linus' tree is not affected.
Failing configs:
http://www.sisk.pl/kernel/debug/next/20080717/HPC_nx6325-config
http://www.sisk.pl/kernel/debug/next/20080717/M3A32-MVP-config
It's not very likely that I'll be able to bisect this issue before OLS, so most
probably I won't be testing linux-next in the next several days.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for July 17: early crash on x86-64
2008-07-17 23:06 ` linux-next: Tree for July 17: early crash on x86-64 Rafael J. Wysocki
@ 2008-07-18 13:52 ` Alexander Beregalov
2008-07-19 3:52 ` Al Viro
0 siblings, 1 reply; 13+ messages in thread
From: Alexander Beregalov @ 2008-07-18 13:52 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Stephen Rothwell, linux-next, LKML, Ingo Molnar, Kernel Testers List
2008/7/18 Rafael J. Wysocki <rjw@sisk.pl>:
> This one crashes all of my x86-64 test boxes early during boot.
The same problem with next-20080718.
Unfortunatelly I do not have serial console on that host.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for July 17: early crash on x86-64
2008-07-18 13:52 ` Alexander Beregalov
@ 2008-07-19 3:52 ` Al Viro
2008-07-19 18:42 ` Rafael J. Wysocki
0 siblings, 1 reply; 13+ messages in thread
From: Al Viro @ 2008-07-19 3:52 UTC (permalink / raw)
To: Alexander Beregalov
Cc: Rafael J. Wysocki, Stephen Rothwell, linux-next, LKML,
Ingo Molnar, Kernel Testers List
On Fri, Jul 18, 2008 at 05:52:23PM +0400, Alexander Beregalov wrote:
> 2008/7/18 Rafael J. Wysocki <rjw@sisk.pl>:
> > This one crashes all of my x86-64 test boxes early during boot.
> The same problem with next-20080718.
> Unfortunatelly I do not have serial console on that host.
vfs-next/net-next conflict; apply the patch below on top of the merge.
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index b91a5de..2240a9e 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -44,13 +44,6 @@ static struct ctl_table_root net_sysctl_root = {
.lookup = net_ctl_header_lookup,
};
-static LIST_HEAD(net_sysctl_ro_tables);
-static struct list_head *net_ctl_ro_header_lookup(struct ctl_table_root *root,
- struct nsproxy *namespaces)
-{
- return &net_sysctl_ro_tables;
-}
-
static int net_ctl_ro_header_perms(struct ctl_table_root *root,
struct nsproxy *namespaces, struct ctl_table *table)
{
@@ -61,7 +54,6 @@ static int net_ctl_ro_header_perms(struct ctl_table_root *root,
}
static struct ctl_table_root net_sysctl_ro_root = {
- .lookup = net_ctl_ro_header_lookup,
.permissions = net_ctl_ro_header_perms,
};
@@ -89,6 +81,7 @@ static __init int sysctl_init(void)
if (ret)
goto out;
register_sysctl_root(&net_sysctl_root);
+ setup_sysctl_set(&net_sysctl_ro_root.default_set, NULL, NULL);
register_sysctl_root(&net_sysctl_ro_root);
out:
return ret;
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for July 17: early crash on x86-64
2008-07-19 3:52 ` Al Viro
@ 2008-07-19 18:42 ` Rafael J. Wysocki
2008-07-19 19:54 ` James Morris
0 siblings, 1 reply; 13+ messages in thread
From: Rafael J. Wysocki @ 2008-07-19 18:42 UTC (permalink / raw)
To: Al Viro
Cc: Alexander Beregalov, Stephen Rothwell, linux-next, LKML,
Ingo Molnar, Kernel Testers List, Stephen Smalley, James Morris,
Eric Paris
On Saturday, 19 of July 2008, Al Viro wrote:
> On Fri, Jul 18, 2008 at 05:52:23PM +0400, Alexander Beregalov wrote:
> > 2008/7/18 Rafael J. Wysocki <rjw@sisk.pl>:
> > > This one crashes all of my x86-64 test boxes early during boot.
> > The same problem with next-20080718.
> > Unfortunatelly I do not have serial console on that host.
>
> vfs-next/net-next conflict; apply the patch below on top of the merge.
That helped, thanks.
But next it ran into the BUG_ON() in line 883 of security/selinux/avc.c .
Disabling selinux made the kernel boot, finally.
> diff --git a/net/sysctl_net.c b/net/sysctl_net.c
> index b91a5de..2240a9e 100644
> --- a/net/sysctl_net.c
> +++ b/net/sysctl_net.c
> @@ -44,13 +44,6 @@ static struct ctl_table_root net_sysctl_root = {
> .lookup = net_ctl_header_lookup,
> };
>
> -static LIST_HEAD(net_sysctl_ro_tables);
> -static struct list_head *net_ctl_ro_header_lookup(struct ctl_table_root *root,
> - struct nsproxy *namespaces)
> -{
> - return &net_sysctl_ro_tables;
> -}
> -
> static int net_ctl_ro_header_perms(struct ctl_table_root *root,
> struct nsproxy *namespaces, struct ctl_table *table)
> {
> @@ -61,7 +54,6 @@ static int net_ctl_ro_header_perms(struct ctl_table_root *root,
> }
>
> static struct ctl_table_root net_sysctl_ro_root = {
> - .lookup = net_ctl_ro_header_lookup,
> .permissions = net_ctl_ro_header_perms,
> };
>
> @@ -89,6 +81,7 @@ static __init int sysctl_init(void)
> if (ret)
> goto out;
> register_sysctl_root(&net_sysctl_root);
> + setup_sysctl_set(&net_sysctl_ro_root.default_set, NULL, NULL);
> register_sysctl_root(&net_sysctl_ro_root);
> out:
> return ret;
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: linux-next: Tree for July 17: early crash on x86-64
2008-07-19 18:42 ` Rafael J. Wysocki
@ 2008-07-19 19:54 ` James Morris
2008-07-20 9:42 ` BUG at security/selinux/avc.c:883 (was: Re: linux-next: Tree for July 17: early crash on x86-64) Thomas Meyer
0 siblings, 1 reply; 13+ messages in thread
From: James Morris @ 2008-07-19 19:54 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Al Viro, Alexander Beregalov, Stephen Rothwell, linux-next, LKML,
Ingo Molnar, Kernel Testers List, Stephen Smalley, Eric Paris
On Sat, 19 Jul 2008, Rafael J. Wysocki wrote:
> > vfs-next/net-next conflict; apply the patch below on top of the merge.
>
> That helped, thanks.
>
> But next it ran into the BUG_ON() in line 883 of security/selinux/avc.c .
> Disabling selinux made the kernel boot, finally.
Ugh, that's not supposed to happen. Where was this in the boot? Do you
have a console log?
- James
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 13+ messages in thread
* BUG at security/selinux/avc.c:883 (was: Re: linux-next: Tree for July 17: early crash on x86-64)
2008-07-19 19:54 ` James Morris
@ 2008-07-20 9:42 ` Thomas Meyer
2008-07-20 12:15 ` Al Viro
0 siblings, 1 reply; 13+ messages in thread
From: Thomas Meyer @ 2008-07-20 9:42 UTC (permalink / raw)
To: James Morris
Cc: Rafael J. Wysocki, Al Viro, Alexander Beregalov,
Stephen Rothwell, linux-next, LKML, Ingo Molnar,
Kernel Testers List, Stephen Smalley, Eric Paris
Am Sonntag, den 20.07.2008, 05:54 +1000 schrieb James Morris:
> On Sat, 19 Jul 2008, Rafael J. Wysocki wrote:
>
> > > vfs-next/net-next conflict; apply the patch below on top of the
> merge.
> >
> > That helped, thanks.
> >
> > But next it ran into the BUG_ON() in line 883 of
> security/selinux/avc.c .
> > Disabling selinux made the kernel boot, finally.
>
> Ugh, that's not supposed to happen. Where was this in the boot? Do
> you
> have a console log?
>
[ 3.845808] ------------[ cut here ]------------
[ 3.845858] kernel BUG at security/selinux/avc.c:883!
[ 3.845910] invalid opcode: 0000 [#1] SMP
[ 3.846004] last sysfs file:
[ 3.846004] Modules linked in:
[ 3.846004]
[ 3.846004] Pid: 1, comm: swapper Not tainted (2.6.26-next-20080718 #17)
[ 3.846004] EIP: 0060:[<c04d31cb>] EFLAGS: 00010246 CPU: 0
[ 3.846066] EIP is at avc_has_perm_noaudit+0x19/0x359
[ 3.846116] EAX: 00000001 EBX: 00000006 ECX: 00000006 EDX: 00000003
[ 3.846168] ESI: f7803280 EDI: f781ee28 EBP: f781ee0c ESP: f781edb8
[ 3.846220] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
[ 3.846272] Process swapper (pid: 1, ti=f781e000 task=f7830000 task.ti=f781e000)
[ 3.846324] Stack: f781ee0c 0006ee18 00000003 00000001 f781edd4 00100000 f7803280 00000001
[ 3.846608] 00000000 f7410f68 f7410f78 f7825000 f781ee10 c0491bcb f781ee64 f7402088
[ 3.846892] 00000004 019ff37b 00000006 f7803280 f781ee28 f781ee48 c04d3e38 00000000
[ 3.847181] Call Trace:
[ 3.847280] [<c0491bcb>] ? __d_lookup+0x9e/0xda
[ 3.847379] [<c04d3e38>] ? avc_has_perm+0x22/0x43
[ 3.847476] [<c0492269>] ? dput+0x34/0xf7
[ 3.847574] [<c04d52d8>] ? inode_has_perm+0x5b/0x65
[ 3.847673] [<c04d5694>] ? selinux_inode_permission+0xff/0x108
[ 3.847771] [<c04d10ca>] ? security_inode_permission+0x1e/0x20
[ 3.847870] [<c04885f4>] ? permission+0xc9/0xdd
[ 3.847968] [<c048862a>] ? vfs_permission+0x10/0x12
[ 3.848070] [<c0481552>] ? sys_faccessat+0xb7/0x149
[ 3.848172] [<c04bd680>] ? sysfs_create_file+0x20/0x22
[ 3.848270] [<c043445b>] ? flush_cpu_workqueue+0x2a/0x66
[ 3.848368] [<c078ae5b>] ? pci_mmcfg_insert_resources+0xc1/0xe8
[ 3.848467] [<c04815f4>] ? sys_access+0x10/0x12
[ 3.848565] [<c0767421>] ? kernel_init+0x22b/0x24f
[ 3.848664] [<c078d4d9>] ? tcp_congestion_default+0x0/0xf
[ 3.848763] [<c0423a0d>] ? schedule_tail+0x1a/0x49
[ 3.848861] [<c04037f2>] ? ret_from_fork+0x6/0x1c
[ 3.848959] [<c07671f6>] ? kernel_init+0x0/0x24f
[ 3.849063] [<c07671f6>] ? kernel_init+0x0/0x24f
[ 3.849161] [<c04044ef>] ? kernel_thread_helper+0x7/0x10
[ 3.849260] =======================
[ 3.849310] Code: c0 b8 e8 6c 7a c0 03 04 95 40 ee 75 c0 ff 40 14 c9 c3 55 89 e5 57 56 53 83 ec 48 83 7d 08 00 89 45 b8 89 55 b4 66 89 4d b2 75 04 <0f> 0b eb fe 64 8b 15 04 50 7a c0 b8 e8 6c 7a c0 0f b7 4d b2 03
[ 3.850916] EIP: [<c04d31cb>] avc_has_perm_noaudit+0x19/0x359 SS:ESP 0068:f781edb8
[ 3.851057] ---[ end trace 357a5e75e9b6bc6a ]---
[ 3.851106] Kernel panic - not syncing: Attempted to kill init!
[ 3.851159] Pid: 1, comm: swapper Tainted: G D 2.6.26-next-20080718 #17
[ 3.851237] [<c063b0bd>] ? printk+0xf/0x12
[ 3.851336] [<c063b007>] panic+0x39/0xe0
[ 3.851410] [<c0429588>] do_exit+0x5b/0x6d1
[ 3.851486] [<c040436c>] ? apic_timer_interrupt+0x28/0x30
[ 3.851585] [<c063b0bd>] ? printk+0xf/0x12
[ 3.851682] [<c042688d>] ? oops_exit+0x23/0x28
[ 3.851786] [<c0404c1d>] die+0x12b/0x133
[ 3.851859] [<c063dad2>] do_trap+0x8a/0xa3
[ 3.851934] [<c0404fc5>] ? do_invalid_op+0x0/0x76
[ 3.852039] [<c0405031>] do_invalid_op+0x6c/0x76
[ 3.852114] [<c04d31cb>] ? avc_has_perm_noaudit+0x19/0x359
[ 3.852212] [<c0439c2c>] ? hrtimer_start+0x126/0x140
[ 3.852312] [<c063d41a>] error_code+0x72/0x78
[ 3.852387] [<c04d31cb>] ? avc_has_perm_noaudit+0x19/0x359
[ 3.852486] [<c0491bcb>] ? __d_lookup+0x9e/0xda
[ 3.852584] [<c04d3e38>] avc_has_perm+0x22/0x43
[ 3.852659] [<c0492269>] ? dput+0x34/0xf7
[ 3.852757] [<c04d52d8>] inode_has_perm+0x5b/0x65
[ 3.852836] [<c04d5694>] selinux_inode_permission+0xff/0x108
[ 3.852912] [<c04d10ca>] security_inode_permission+0x1e/0x20
[ 3.852989] [<c04885f4>] permission+0xc9/0xdd
[ 3.853070] [<c048862a>] vfs_permission+0x10/0x12
[ 3.853149] [<c0481552>] sys_faccessat+0xb7/0x149
[ 3.853227] [<c04bd680>] ? sysfs_create_file+0x20/0x22
[ 3.853328] [<c043445b>] ? flush_cpu_workqueue+0x2a/0x66
[ 3.853431] [<c078ae5b>] ? pci_mmcfg_insert_resources+0xc1/0xe8
[ 3.853532] [<c04815f4>] sys_access+0x10/0x12
[ 3.853609] [<c0767421>] kernel_init+0x22b/0x24f
[ 3.853688] [<c078d4d9>] ? tcp_congestion_default+0x0/0xf
[ 3.853797] [<c0423a0d>] ? schedule_tail+0x1a/0x49
[ 3.853896] [<c04037f2>] ? ret_from_fork+0x6/0x1c
[ 3.853996] [<c07671f6>] ? kernel_init+0x0/0x24f
[ 3.854099] [<c07671f6>] ? kernel_init+0x0/0x24f
[ 3.854198] [<c04044ef>] kernel_thread_helper+0x7/0x10
[ 3.854276] =======================
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: BUG at security/selinux/avc.c:883 (was: Re: linux-next: Tree for July 17: early crash on x86-64)
2008-07-20 9:42 ` BUG at security/selinux/avc.c:883 (was: Re: linux-next: Tree for July 17: early crash on x86-64) Thomas Meyer
@ 2008-07-20 12:15 ` Al Viro
2008-07-28 17:32 ` Stephen Smalley
0 siblings, 1 reply; 13+ messages in thread
From: Al Viro @ 2008-07-20 12:15 UTC (permalink / raw)
To: Thomas Meyer
Cc: James Morris, Rafael J. Wysocki, Alexander Beregalov,
Stephen Rothwell, linux-next, LKML, Ingo Molnar,
Kernel Testers List, Stephen Smalley, Eric Paris
On Sun, Jul 20, 2008 at 11:42:53AM +0200, Thomas Meyer wrote:
> Am Sonntag, den 20.07.2008, 05:54 +1000 schrieb James Morris:
> > On Sat, 19 Jul 2008, Rafael J. Wysocki wrote:
> >
> > > > vfs-next/net-next conflict; apply the patch below on top of the
> > merge.
> > >
> > > That helped, thanks.
> > >
> > > But next it ran into the BUG_ON() in line 883 of
> > security/selinux/avc.c .
> > > Disabling selinux made the kernel boot, finally.
> >
> > Ugh, that's not supposed to happen. Where was this in the boot? Do
> > you
> > have a console log?
Argh... Fallout from ->permission() patch series. I've folded that into
rebase (along with Randy's compile fixes and missing bit in capability.c
in ->inode_permission() patch; AFAICS takes care of all mismerges as well).
In the meanwhile, see the patch below on top of next-20080718:
diff --git a/fs/namei.c b/fs/namei.c
index a15c155..c0a64e2 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -286,7 +286,8 @@ int permission(struct inode *inode, int mask, struct nameidata *nd)
if (retval)
return retval;
- return security_inode_permission(inode, mask);
+ return security_inode_permission(inode,
+ mask & (MAY_READ|MAY_WRITE|MAY_EXEC));
}
/**
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: BUG at security/selinux/avc.c:883 (was: Re: linux-next: Tree for July 17: early crash on x86-64)
2008-07-20 12:15 ` Al Viro
@ 2008-07-28 17:32 ` Stephen Smalley
2008-07-28 21:38 ` James Morris
0 siblings, 1 reply; 13+ messages in thread
From: Stephen Smalley @ 2008-07-28 17:32 UTC (permalink / raw)
To: Al Viro
Cc: Thomas Meyer, James Morris, Rafael J. Wysocki,
Alexander Beregalov, Stephen Rothwell, linux-next, LKML,
Ingo Molnar, Kernel Testers List, Eric Paris
On Sun, 2008-07-20 at 13:15 +0100, Al Viro wrote:
> On Sun, Jul 20, 2008 at 11:42:53AM +0200, Thomas Meyer wrote:
> > Am Sonntag, den 20.07.2008, 05:54 +1000 schrieb James Morris:
> > > On Sat, 19 Jul 2008, Rafael J. Wysocki wrote:
> > >
> > > > > vfs-next/net-next conflict; apply the patch below on top of the
> > > merge.
> > > >
> > > > That helped, thanks.
> > > >
> > > > But next it ran into the BUG_ON() in line 883 of
> > > security/selinux/avc.c .
> > > > Disabling selinux made the kernel boot, finally.
> > >
> > > Ugh, that's not supposed to happen. Where was this in the boot? Do
> > > you
> > > have a console log?
>
> Argh... Fallout from ->permission() patch series. I've folded that into
> rebase (along with Randy's compile fixes and missing bit in capability.c
> in ->inode_permission() patch; AFAICS takes care of all mismerges as well).
> In the meanwhile, see the patch below on top of next-20080718:
>
> diff --git a/fs/namei.c b/fs/namei.c
> index a15c155..c0a64e2 100644
> --- a/fs/namei.c
> +++ b/fs/namei.c
> @@ -286,7 +286,8 @@ int permission(struct inode *inode, int mask, struct nameidata *nd)
> if (retval)
> return retval;
>
> - return security_inode_permission(inode, mask);
> + return security_inode_permission(inode,
> + mask & (MAY_READ|MAY_WRITE|MAY_EXEC));
> }
>
> /**
SELinux needs MAY_APPEND to be passed down to the security hook.
Otherwise, we get permission denials when only append permission is
granted by policy even if the opening process specified O_APPEND.
Shows up as a regression in the ltp selinux testsuite, fixed by
this patch.
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
---
fs/namei.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/namei.c b/fs/namei.c
index a7b0a0b..b91e973 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -274,7 +274,7 @@ int inode_permission(struct inode *inode, int mask)
return retval;
return security_inode_permission(inode,
- mask & (MAY_READ|MAY_WRITE|MAY_EXEC));
+ mask & (MAY_READ|MAY_WRITE|MAY_EXEC|MAY_APPEND));
}
/**
--
Stephen Smalley
National Security Agency
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: BUG at security/selinux/avc.c:883 (was: Re: linux-next: Tree for July 17: early crash on x86-64)
2008-07-28 17:32 ` Stephen Smalley
@ 2008-07-28 21:38 ` James Morris
2008-07-29 0:33 ` Al Viro
0 siblings, 1 reply; 13+ messages in thread
From: James Morris @ 2008-07-28 21:38 UTC (permalink / raw)
To: Stephen Smalley
Cc: Al Viro, Thomas Meyer, Rafael J. Wysocki, Alexander Beregalov,
Stephen Rothwell, linux-next, LKML, Ingo Molnar,
Kernel Testers List, Eric Paris, linux-security-module
On Mon, 28 Jul 2008, Stephen Smalley wrote:
> SELinux needs MAY_APPEND to be passed down to the security hook.
> Otherwise, we get permission denials when only append permission is
> granted by policy even if the opening process specified O_APPEND.
> Shows up as a regression in the ltp selinux testsuite, fixed by
> this patch.
>
> Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#hotfixes
Al, holler if you want to push this through your tree.
---
fs/namei.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/namei.c b/fs/namei.c
index a7b0a0b..b91e973 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -274,7 +274,7 @@ int inode_permission(struct inode *inode, int mask)
return retval;
return security_inode_permission(inode,
- mask & (MAY_READ|MAY_WRITE|MAY_EXEC));
+ mask & (MAY_READ|MAY_WRITE|MAY_EXEC|MAY_APPEND));
}
/**
- James
--
James Morris
<jmorris@namei.org>
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: BUG at security/selinux/avc.c:883 (was: Re: linux-next: Tree for July 17: early crash on x86-64)
2008-07-28 21:38 ` James Morris
@ 2008-07-29 0:33 ` Al Viro
0 siblings, 0 replies; 13+ messages in thread
From: Al Viro @ 2008-07-29 0:33 UTC (permalink / raw)
To: James Morris
Cc: Stephen Smalley, Thomas Meyer, Rafael J. Wysocki,
Alexander Beregalov, Stephen Rothwell, linux-next, LKML,
Ingo Molnar, Kernel Testers List, Eric Paris,
linux-security-module
On Tue, Jul 29, 2008 at 07:38:17AM +1000, James Morris wrote:
> On Mon, 28 Jul 2008, Stephen Smalley wrote:
>
> > SELinux needs MAY_APPEND to be passed down to the security hook.
> > Otherwise, we get permission denials when only append permission is
> > granted by policy even if the opening process specified O_APPEND.
> > Shows up as a regression in the ltp selinux testsuite, fixed by
> > this patch.
> >
> > Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
>
> Applied to
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#hotfixes
>
>
> Al, holler if you want to push this through your tree.
Applied, will push along with other patches tonight...
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2008-07-29 0:33 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-07-17 15:28 linux-next: Tree for July 17 Stephen Rothwell
2008-07-17 22:21 ` linux-next: Tree for July 17 (sysctl/syscall) Randy Dunlap
2008-07-17 22:34 ` linux-next: Tree for July 17 (net_namespace) Randy Dunlap
2008-07-17 23:06 ` linux-next: Tree for July 17: early crash on x86-64 Rafael J. Wysocki
2008-07-18 13:52 ` Alexander Beregalov
2008-07-19 3:52 ` Al Viro
2008-07-19 18:42 ` Rafael J. Wysocki
2008-07-19 19:54 ` James Morris
2008-07-20 9:42 ` BUG at security/selinux/avc.c:883 (was: Re: linux-next: Tree for July 17: early crash on x86-64) Thomas Meyer
2008-07-20 12:15 ` Al Viro
2008-07-28 17:32 ` Stephen Smalley
2008-07-28 21:38 ` James Morris
2008-07-29 0:33 ` Al Viro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).