1. 15 Jun, 2009 4 commits
  2. 14 Jun, 2009 27 commits
  3. 13 Jun, 2009 9 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · 44b7532b
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
        [SCSI] cnic: fix error: implicit declaration of function ‘__symbol_get’
        [SCSI] cnic: fix undefined reference to `ip6_route_output'
      44b7532b
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 · 84c48e6f
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
        avr32: Fix oops on unaligned user access
        avr32: Add support for Mediama RMTx add-on board for ATNGW100
        avr32: Change Atmel ATNGW100 config to add choice of add-on board
        Fix MIMC200 board LCD init
        avr32: Fix clash in ATMEL_USART_ flags
        avr32: remove obsolete hw_interrupt_type
        avr32: Solves problem with inverted MCI detect pin on Merisc board
        atmel-mci: Add support for inverted detect pin
      84c48e6f
    • David Howells's avatar
      FRV: Fix interaction with new generic header stuff · 5c55b40b
      David Howells authored
      Fix interaction with new generic header stuff as added by:
      
      	commit 6103ec56
      	Author: Arnd Bergmann <arnd@arndb.de>
      	Date:   Wed May 13 22:56:27 2009 +0000
      
      	    asm-generic: add generic ABI headers
      
      The problem is that asm/signal.h has been made to include asm-generic/signal.h,
      but the redundant stuff from asm/signal.h has not been discarded, leading to
      multiple redefinitions.
      
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5c55b40b
    • Linus Torvalds's avatar
      Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux · d32f60ed
      Linus Torvalds authored
      * 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
        i2c-ocores: Can add I2C devices to the bus
        i2c-s3c2410: move to using platform idtable to match devices
        i2c: OMAP3: Better noise suppression for fast/standard modes
        i2c: OMAP2/3: Fix scll/sclh calculations
        i2c: Blackfin TWI: implement I2C_FUNC_SMBUS_I2C_BLOCK functionality
        i2c: Blackfin TWI: fix transfer errors with repeat start
        i2c: Blackfin TWI: fix REPEAT START mode doesn't repeat
        i2c: Blackfin TWI: make sure we don't end up with a CLKDIV=0
      d32f60ed
    • Linus Torvalds's avatar
      Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · a2ee2981
      Linus Torvalds authored
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (80 commits)
        x86, mce: Add boot options for corrected errors
        x86, mce: Fix mce printing
        x86, mce: fix for mce counters
        x86, mce: support action-optional machine checks
        x86, mce: define MCE_VECTOR
        x86, mce: rename mce_notify_user to mce_notify_irq
        x86: fix panic with interrupts off (needed for MCE)
        x86, mce: export MCE severities coverage via debugfs
        x86, mce: implement new status bits
        x86, mce: print header/footer only once for multiple MCEs
        x86, mce: default to panic timeout for machine checks
        x86, mce: improve mce_get_rip
        x86, mce: make non Monarch panic message "Fatal machine check" too
        x86, mce: switch x86 machine check handler to Monarch election.
        x86, mce: implement panic synchronization
        x86, mce: implement bootstrapping for machine check wakeups
        x86, mce: check early in exception handler if panic is needed
        x86, mce: add table driven machine check grading
        x86, mce: remove TSC print heuristic
        x86, mce: log corrected errors when panicing
        ...
      a2ee2981
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 7603ef03
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs: (23 commits)
        xfs: fix small mismerge in xfs_vn_mknod
        xfs: fix warnings with CONFIG_XFS_QUOTA disabled
        xfs: fix freeing memory in xfs_getbmap()
        xfs: use generic Posix ACL code
        xfs: remove SYNC_BDFLUSH
        xfs: remove SYNC_IOWAIT
        xfs: split xfs_sync_inodes
        xfs: use generic inode iterator in xfs_qm_dqrele_all_inodes
        xfs: introduce a per-ag inode iterator
        xfs: remove unused parameter from xfs_reclaim_inodes
        xfs: factor out inode validation for sync
        xfs: split inode flushing from xfs_sync_inodes_ag
        xfs: split inode data writeback from xfs_sync_inodes_ag
        xfs: kill xfs_qmops
        xfs: validate quota log items during log recovery
        xfs: update max log size
        xfs: prevent deadlock in xfs_qm_shake()
        xfs: fix overflow in xfs_growfs_data_private
        xfs: fix double unlock in xfs_swap_extents()
        xfs: fix getbmap vs mmap deadlock
        ...
      7603ef03
    • Linus Torvalds's avatar
      Merge branch 'docs-next' of git://git.lwn.net/linux-2.6 · 1904187a
      Linus Torvalds authored
      * 'docs-next' of git://git.lwn.net/linux-2.6:
        Document the debugfs API
        Documentation: Add "how to write a good patch summary" to SubmittingPatches
        SubmittingPatches: fix typo
        docs: Encourage better changelogs in the development process document
        Document Reported-by in SubmittingPatches
      1904187a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 32f44d62
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (35 commits)
        hwrng: timeriomem - Fix potential oops (request_mem_region/__devinit)
        crypto: api - Use formatting of module name
        crypto: testmgr - Allow hash test vectors longer than a page
        crypto: testmgr - Check all test vector lengths
        crypto: hifn_795x - fix __dev{init,exit} markings
        crypto: tcrypt - Do not exit on success in fips mode
        crypto: compress - Return produced bytes in crypto_{,de}compress_{update,final}
        hwrng: via_rng - Support VIA Nano hardware RNG on X86_64 builds
        hwrng: via_rng - Support VIA Nano hardware RNG
        hwrng: via_rng - The VIA Hardware RNG driver is for the CPU, not Chipset
        crypto: testmgr - Skip algs not flagged fips_allowed in fips mode
        crypto: testmgr - Mark algs allowed in fips mode
        crypto: testmgr - Add ctr(aes) test vectors
        crypto: testmgr - Dynamically allocate xbuf and axbuf
        crypto: testmgr - Print self-test pass notices in fips mode
        crypto: testmgr - Catch base cipher self-test failures in fips mode
        crypto: testmgr - Add ansi_cprng test vectors
        crypto: testmgr - Add infrastructure for ansi_cprng self-tests
        crypto: testmgr - Add self-tests for rfc4309(ccm(aes))
        crypto: testmgr - Handle AEAD test vectors expected to fail verification
        ...
      32f44d62
    • Ingo Molnar's avatar
      [SCSI] cnic: fix error: implicit declaration of function ‘__symbol_get’ · bc3bf8fd
      Ingo Molnar authored
       drivers/net/cnic.c: In function ‘init_bnx2_cnic’:
       drivers/net/cnic.c:2520: error: implicit declaration of function ‘__symbol_get’
       drivers/net/cnic.c:2520: warning: assignment makes pointer from integer without a cast
       make[1]: *** [drivers/net/cnic.o] Error 1
       make: *** [drivers/net/cnic.o] Error 2
      
      Caused by not including linux/module.h
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
      bc3bf8fd