1. 16 Oct, 2007 29 commits
  2. 15 Oct, 2007 11 commits
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 65a6ec0d
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (95 commits)
        [ARM] 4578/1: CM-x270: PCMCIA support
        [ARM] 4577/1: ITE 8152 PCI bridge support
        [ARM] 4576/1: CM-X270 machine support
        [ARM] pxa: Avoid pxa_gpio_mode() in gpio_direction_{in,out}put()
        [ARM] pxa: move pxa_set_mode() from pxa2xx_mainstone.c to mainstone.c
        [ARM] pxa: move pxa_set_mode() from pxa2xx_lubbock.c to lubbock.c
        [ARM] pxa: Make cpu_is_pxaXXX dependent on configuration symbols
        [ARM] pxa: PXA3xx base support
        [NET] smc91x: fix PXA DMA support code
        [SERIAL] Fix console initialisation ordering
        [ARM] pxa: tidy up arch/arm/mach-pxa/Makefile
        [ARM] Update arch/arm/Kconfig for drivers/Kconfig changes
        [ARM] 4600/1: fix kernel build failure with build-id-supporting binutils
        [ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)
        [ARM] Rename consistent_sync() as dma_cache_maint()
        [ARM] 4572/1: ep93xx: add cirrus logic edb9307 support
        [ARM] 4596/1: S3C2412: Correct IRQs for SDI+CF and add decoding support
        [ARM] 4595/1: ns9xxx: define registers as void __iomem * instead of volatile u32
        [ARM] 4594/1: ns9xxx: use the new gpio functions
        [ARM] 4593/1: ns9xxx: implement generic clockevents
        ...
      65a6ec0d
    • Linus Torvalds's avatar
      Merge branch 'locks' of git://linux-nfs.org/~bfields/linux · 541010e4
      Linus Torvalds authored
      * 'locks' of git://linux-nfs.org/~bfields/linux:
        nfsd: remove IS_ISMNDLCK macro
        Rework /proc/locks via seq_files and seq_list helpers
        fs/locks.c: use list_for_each_entry() instead of list_for_each()
        NFS: clean up explicit check for mandatory locks
        AFS: clean up explicit check for mandatory locks
        9PFS: clean up explicit check for mandatory locks
        GFS2: clean up explicit check for mandatory locks
        Cleanup macros for distinguishing mandatory locks
        Documentation: move locks.txt in filesystems/
        locks: add warning about mandatory locking races
        Documentation: move mandatory locking documentation to filesystems/
        locks: Fix potential OOPS in generic_setlease()
        Use list_first_entry in locks_wake_up_blocks
        locks: fix flock_lock_file() comment
        Memory shortage can result in inconsistent flocks state
        locks: kill redundant local variable
        locks: reverse order of posix_locks_conflict() arguments
      541010e4
    • Linus Torvalds's avatar
    • Jeff Garzik's avatar
      [libata] pata_cs5536: new API build fix · 3d8a67b9
      Jeff Garzik authored
      This driver was using hooks that were very recently removed.
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      3d8a67b9
    • Linus Torvalds's avatar
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · a52cefc8
      Linus Torvalds authored
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
        [IPV6]: Consolidate the ip6_pol_route_(input|output) pair
        [TCP]: Make snd_cwnd_cnt 32-bit
        [TCP]: Update the /proc/net/tcp documentation
        [NETNS]: Don't panic on creating the namespace's loopback
        [NEIGH]: Ensure that pneigh_lookup is protected with RTNL
        [INET]: kmalloc+memset -> kzalloc in frag_alloc_queue
        [ISDN]: Fix compile with CONFIG_ISDN_X25 disabled.
        [IPV6]: Replace sk_buff ** with sk_buff * in input handlers
        [SELINUX]: Update for netfilter ->hook() arg changes.
        [INET]: Consolidate the xxx_put
        [INET]: Small cleanup for xxx_put after evictor consolidation
        [INET]: Consolidate the xxx_evictor
        [INET]: Consolidate the xxx_frag_destroy
        [INET]: Consolidate xxx_the secret_rebuild
        [INET]: Consolidate the xxx_frag_kill
        [INET]: Collect common frag sysctl variables together
        [INET]: Collect frag queues management objects together
        [INET]: Move common fields from frag_queues in one place.
        [TG3]: Fix performance regression on 5705.
        [ISDN]: Remove local copy of device name to make sure renames work.
        ...
      a52cefc8
    • Jeremy Katz's avatar
      Map volume and brightness events on thinkpads · fba956c4
      Jeremy Katz authored
      There are standard keycodes for brightness and volume; map the events to
      emit them so that things work properly
      Signed-off-by: default avatarJeremy Katz <katzj@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fba956c4
    • Tony Luck's avatar
      [IA64] build fix for scatterlist · 0df333ce
      Tony Luck authored
      include/scsi/scsi_eh.h:79: error: field `sense_sgl' has incomplete type
      
      x86 resolves this by including scatterlist.h from dma-mapping.h which
      seems as good a place as any.
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      0df333ce
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · f2e1d89f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
        Input: use full RCU API
        Input: remove tsdev interface
        Input: add support for Blackfin BF54x Keypad controller
        Input: appletouch - another fix for idle reset logic
        HWMON: hdaps - switch to using input-polldev
        Input: add support for SEGA Dreamcast keyboard
        Input: omap-keyboard - don't pretend we support changing keymap
        Input: lifebook - fix X and Y axis range
        Input: usbtouchscreen - add support for GeneralTouch devices
        Input: fix open count handling in input interfaces
        Input: keyboard - add CapsShift lock
        Input: adbhid - produce all CapsLock key events
        Input: ALPS - add signature for ThinkPad R61
        Input: jornada720_kbd - send MSC_SCAN events
        Input: add support for the HP Jornada 7xx (710/720/728) touchscreen
        Input: add support for HP Jornada 7xx onboard keyboard
        Input: add support for HP Jornada onboard keyboard (HP6XX)
        Input: ucb1400_ts - use schedule_timeout_uninterruptible
        Input: xpad - fix dependancy on LEDS class
        Input: auto-select INPUT for MAC_EMUMOUSEBTN option
        ...
      
      Resolved conflicts manually in drivers/hwmon/applesmc.c: converting from
      a class device to a device and converting to use input-polldev created a
      few apparently trivial clashes..
      f2e1d89f
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 85ffdd28
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        [libata] pata_pcmcia: Add additional id string (corsair, 1GB)
        libata: prevent devices with blank model names from being DMA blacklisted
        ata_piix: SATA 2port controller port map fix
        pata_cs5536: ATA driver for Geode companion chip
        libata: add ST9160821AS / 3.CCD to NCQ blacklist
        libata: fix revalidation issuing after configuration commands
        [libata] sata_nv: add SW NCQ support for MCP51/MCP55/MCP61
        [libata] pata_sil680: Add MMIO support
      85ffdd28
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 43d39ae0
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (35 commits)
        xen-netfront: rearrange netfront structure to separate tx and rx
        netdev: convert non-obvious instances to use ARRAY_SIZE()
        ucc_geth: Fix build break introduced by commit 09f75cd7
        gianfar: Fix regression caused by new napi interface
        gianfar: Cleanup compile warning caused by 0795af57
        gianfar: Fix compile regression caused by bea3348e
        add new prom.h for AU1x00
        update AU1000 get_ethernet_addr()
        MIPSsim: General cleanup
        Jazzsonic: Fix warning about unused variable.
        Remove msic_dcr_read() in axon_msi.c
        Use dcr_host_t.base in dcr_unmap()
        Add dcr_host_t.base in dcr_read()/dcr_write()
        Use dcr_host_t.base in ibm_emac_mal
        Update ibm_newemac to use dcr_host_t.base
        tehuti: possible leak in bdx_probe
        TC35815: Fix build
        SAA9730: Fix build
        AR7 ethernet
        myri10ge: update driver version to 1.3.2-1.287
        ...
      43d39ae0
    • Jeremy Fitzhardinge's avatar
      xen-netfront: rearrange netfront structure to separate tx and rx · 84284d3c
      Jeremy Fitzhardinge authored
      Keep tx and rx elements separate on different cachelines to prevent
      bouncing.
      Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@xensource.com>
      Acked-by: default avatarJeff Garzik <jgarzik@pobox.com>
      Cc: Stephen Hemminger <shemminger@linux-foundation.org>
      Cc: Christoph Hellwig <hch@infradead.org>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      84284d3c