04 Jul, 2006

2 commits

  • The PS/2 code has a natural device order and there is a one level recursion in
    this device order in terms of the cmd_mutex; annotate this explicit recursion
    as ok.

    Has no effect on non-lockdep kernels.

    Signed-off-by: Arjan van de Ven
    Cc: Dmitry Torokhov
    Cc: Ingo Molnar
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Arjan van de Ven
     
  • drivers/input/serio/i8042-sparcio.h:91: error: '__mod_of_device_table' aliased to undefined symbol 'i8042_match'

    Cc: Dmitry Torokhov
    DESC
    sparc: resource warning fix
    EDESC
    From: Andrew Morton

    sound/sparc/amd7930.c: In function 'amd7930_attach_common':
    sound/sparc/amd7930.c:1040: warning: format '%08lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t'

    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     

03 Jul, 2006

2 commits

  • * 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm: (24 commits)
    [ARM] 3683/2: ARM: Convert at91rm9200 to generic irq handling
    [ARM] 3682/2: ARM: Convert ixp4xx to generic irq handling
    [ARM] 3702/1: ARM: Convert ixp23xx to generic irq handling
    [ARM] 3701/1: ARM: Convert plat-omap to generic irq handling
    [ARM] 3700/1: ARM: Convert lh7a40x to generic irq handling
    [ARM] 3699/1: ARM: Convert s3c2410 to generic irq handling
    [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling
    [ARM] 3697/1: ARM: Convert shark to generic irq handling
    [ARM] 3696/1: ARM: Convert clps711x to generic irq handling
    [ARM] 3694/1: ARM: Convert ecard driver to generic irq handling
    [ARM] 3693/1: ARM: Convert omap1 to generic irq handling
    [ARM] 3691/1: ARM: Convert imx to generic irq handling
    [ARM] 3688/1: ARM: Convert clps7500 to generic irq handling
    [ARM] 3687/1: ARM: Convert integrator to generic irq handling
    [ARM] 3685/1: ARM: Convert pxa to generic irq handling
    [ARM] 3684/1: ARM: Convert l7200 to generic irq handling
    [ARM] 3681/1: ARM: Convert ixp2000 to generic irq handling
    [ARM] 3680/1: ARM: Convert footbridge to generic irq handling
    [ARM] 3695/1: ARM drivers/pcmcia: Fixup includes
    [ARM] 3689/1: ARM drivers/input/touchscreen: Fixup includes
    ...

    Manual conflict resolved in kernel/irq/handle.c (butt-ugly ARM tickless
    code).

    Linus Torvalds
     
  • Signed-off-by: Thomas Gleixner
    Cc: Ingo Molnar
    Cc: "David S. Miller"
    Cc: Benjamin Herrenschmidt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Thomas Gleixner
     

02 Jul, 2006

1 commit


01 Jul, 2006

1 commit


30 Jun, 2006

3 commits

  • Signed-off-by: David S. Miller

    David S. Miller
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6: (22 commits)
    [PATCH] devfs: Remove it from the feature_removal.txt file
    [PATCH] devfs: Last little devfs cleanups throughout the kernel tree.
    [PATCH] devfs: Rename TTY_DRIVER_NO_DEVFS to TTY_DRIVER_DYNAMIC_DEV
    [PATCH] devfs: Remove the tty_driver devfs_name field as it's no longer needed
    [PATCH] devfs: Remove the line_driver devfs_name field as it's no longer needed
    [PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed
    [PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed
    [PATCH] devfs: Remove the miscdevice devfs_name field as it's no longer needed
    [PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree
    [PATCH] devfs: Remove devfs_remove() function from the kernel tree
    [PATCH] devfs: Remove devfs_mk_cdev() function from the kernel tree
    [PATCH] devfs: Remove devfs_mk_bdev() function from the kernel tree
    [PATCH] devfs: Remove devfs_mk_symlink() function from the kernel tree
    [PATCH] devfs: Remove devfs_mk_dir() function from the kernel tree
    [PATCH] devfs: Remove devfs_*_tape() functions from the kernel tree
    [PATCH] devfs: Remove devfs support from the sound subsystem
    [PATCH] devfs: Remove devfs support from the ide subsystem.
    [PATCH] devfs: Remove devfs support from the serial subsystem
    [PATCH] devfs: Remove devfs from the init code
    [PATCH] devfs: Remove devfs from the partition code
    ...

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
    [PATCH] i386: export memory more than 4G through /proc/iomem
    [PATCH] 64bit Resource: finally enable 64bit resource sizes
    [PATCH] 64bit Resource: convert a few remaining drivers to use resource_size_t where needed
    [PATCH] 64bit resource: change pnp core to use resource_size_t
    [PATCH] 64bit resource: change pci core and arch code to use resource_size_t
    [PATCH] 64bit resource: change resource core to use resource_size_t
    [PATCH] 64bit resource: introduce resource_size_t for the start and end of struct resource
    [PATCH] 64bit resource: fix up printks for resources in misc drivers
    [PATCH] 64bit resource: fix up printks for resources in arch and core code
    [PATCH] 64bit resource: fix up printks for resources in pcmcia drivers
    [PATCH] 64bit resource: fix up printks for resources in video drivers
    [PATCH] 64bit resource: fix up printks for resources in ide drivers
    [PATCH] 64bit resource: fix up printks for resources in mtd drivers
    [PATCH] 64bit resource: fix up printks for resources in pci core and hotplug drivers
    [PATCH] 64bit resource: fix up printks for resources in networks drivers
    [PATCH] 64bit resource: fix up printks for resources in sound drivers
    [PATCH] 64bit resource: C99 changes for struct resource declarations

    Fixed up trivial conflict in drivers/ide/pci/cmd64x.c (the printk that
    was changed by the 64-bit resources had been deleted in the meantime ;)

    Linus Torvalds
     

29 Jun, 2006

1 commit


28 Jun, 2006

4 commits


27 Jun, 2006

2 commits


26 Jun, 2006

14 commits


24 Jun, 2006

2 commits


23 Jun, 2006

2 commits

  • Pass the POSIX lock owner ID to the flush operation.

    This is useful for filesystems which don't want to store any locking state
    in inode->i_flock but want to handle locking/unlocking POSIX locks
    internally. FUSE is one such filesystem but I think it possible that some
    network filesystems would need this also.

    Also add a flag to indicate that a POSIX locking request was generated by
    close(), so filesystems using the above feature won't send an extra locking
    request in this case.

    Signed-off-by: Miklos Szeredi
    Cc: Trond Myklebust
    Cc: Al Viro
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Miklos Szeredi
     
  • Dump the extra mapping in the amikbd interrupt handler, so old Amiga keymaps
    work again. Amigas need a special keymap anyway, standard keymaps are not
    usable and recreating all keymaps is simply not worth the trouble.

    Signed-off-by: Roman Zippel
    Cc: Dmitry Torokhov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Roman Zippel
     

05 Jun, 2006

1 commit

  • Use -ENOSPC instead of -ENOMEM when the iforce device doesn't have
    enough free memory for the new effect. All other drivers are using
    -ENOSPC, so this makes the behaviour coherent.

    Signed-off-by: Anssi Hannula
    Signed-off-by: Andrew Morton
    Signed-off-by: Dmitry Torokhov

    Anssi Hannula
     

30 May, 2006

5 commits