04 Apr, 2009

3 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits)
    trivial: Update my email address
    trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
    trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
    trivial: Fix misspelling of "Celsius".
    trivial: remove unused variable 'path' in alloc_file()
    trivial: fix a pdlfush -> pdflush typo in comment
    trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
    trivial: wusb: Storage class should be before const qualifier
    trivial: drivers/char/bsr.c: Storage class should be before const qualifier
    trivial: h8300: Storage class should be before const qualifier
    trivial: fix where cgroup documentation is not correctly referred to
    trivial: Give the right path in Documentation example
    trivial: MTD: remove EOL from MODULE_DESCRIPTION
    trivial: Fix typo in bio_split()'s documentation
    trivial: PWM: fix of #endif comment
    trivial: fix typos/grammar errors in Kconfig texts
    trivial: Fix misspelling of firmware
    trivial: cgroups: documentation typo and spelling corrections
    trivial: Update contact info for Jochen Hein
    trivial: fix typo "resgister" -> "register"
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (32 commits)
    regulator: twl4030 VAUX3 supports 3.0V
    regulator: Support disabling of unused regulators by machines
    regulator: Don't increment use_count for boot_on regulators
    twl4030-regulator: expose VPLL2
    regulator: refcount fixes
    regulator: Don't warn if we failed to get a regulator
    regulator: Allow boot_on regulators to be disabled by clients
    regulator: Implement list_voltage for WM835x LDOs and DCDCs
    twl4030-regulator: list more VAUX4 voltages
    regulator: Don't warn on omitted voltage constraints
    regulator: Implement list_voltage() for WM8400 DCDCs and LDOs
    MMC: regulator utilities
    regulator: twl4030 voltage enumeration (v2)
    regulator: twl4030 regulators
    regulator: get_status() grows kerneldoc
    regulator: enumerate voltages (v2)
    regulator: Fix get_mode() for WM835x DCDCs
    regulator: Allow regulators to set the initial operating mode
    regulator: Suggest use of datasheet supply or pin names for consumers
    regulator: email - update email address and regulator webpage.
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://oss.sgi.com/xfs/xfs: (61 commits)
    Revert "xfs: increase the maximum number of supported ACL entries"
    xfs: cleanup uuid handling
    xfs: remove m_attroffset
    xfs: fix various typos
    xfs: pagecache usage optimization
    xfs: remove m_litino
    xfs: kill ino64 mount option
    xfs: kill mutex_t typedef
    xfs: increase the maximum number of supported ACL entries
    xfs: factor out code to find the longest free extent in the AG
    xfs: kill VN_BAD
    xfs: kill vn_atime_* helpers.
    xfs: cleanup xlog_bread
    xfs: cleanup xlog_recover_do_trans
    xfs: remove another leftover of the old inode log item format
    xfs: cleanup log unmount handling
    Fix xfs debug build breakage by pushing xfs_error.h after
    xfs: include header files for prototypes
    xfs: make symbols static
    xfs: move declaration to header file
    ...

    Linus Torvalds
     

03 Apr, 2009

2 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (54 commits)
    glge: remove unused #include
    dnet: remove unused #include
    tcp: miscounts due to tcp_fragment pcount reset
    tcp: add helper for counter tweaking due mid-wq change
    hso: fix for the 'invalid frame length' messages
    hso: fix for crash when unplugging the device
    fsl_pq_mdio: Fix compile failure
    fsl_pq_mdio: Revive UCC MDIO support
    ucc_geth: Pass proper device to DMA routines, otherwise oops happens
    i.MX31: Fixing cs89x0 network building to i.MX31ADS
    tc35815: Fix build error if NAPI enabled
    hso: add Vendor/Product ID's for new devices
    ucc_geth: Remove unused header
    gianfar: Remove unused header
    kaweth: Fix locking to be SMP-safe
    net: allow multiple dev per napi with GRO
    r8169: reset IntrStatus after chip reset
    ixgbe: Fix potential memory leak/driver panic issue while setting up Tx & Rx ring parameters
    ixgbe: fix ethtool -A|a behavior
    ixgbe: Patch to fix driver panic while freeing up tx & rx resources
    ...

    Linus Torvalds
     
  • Add a MAINTAINERS entry for the hypervisor virtual console driver.

    Signed-off-by: Michael Ellerman
    Acked-by: Josh Boyer
    Cc: Josh Boyer
    Cc: Benjamin Herrenschmidt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Ellerman
     

02 Apr, 2009

3 commits

  • - update to Maintainer list of S2IO 10GbE drivers (xframe/vxge).

    Signed-off-by: Sivakumar Subramani
    Signed-off-by: Rastapur Santosh
    Signed-off-by: Ramkrishna Vepa
    Signed-off-by: David S. Miller

    Ramkrishna Vepa
     
  • …linux-2.6 into for-linus

    Felix Blyakher
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (59 commits)
    ide-floppy: do not complete rq's prematurely
    ide: be able to build pmac driver without IDE built-in
    ide-pmac: IDE cable detection on Apple PowerBook
    ide: inline SELECT_DRIVE()
    ide: turn selectproc() method into dev_select() method (take 5)
    MAINTAINERS: move old ide-{floppy,tape} entries to CREDITS (take 2)
    ide: move data register access out of tf_{read|load}() methods (take 2)
    ide: call {in|out}put_data() methods from tf_{read|load}() methods (take 2)
    ide-io-std: shorten ide_{in|out}put_data()
    ide: rename IDE_TFLAG_IN_[HOB_]FEATURE
    ide: turn set_irq() method into write_devctl() method
    ide: use ATA_HOB
    ide-disk: use ATA_ERR
    ide: add support for CFA specified transfer modes (take 3)
    ide-iops: only clear DMA words on setting DMA mode
    ide: identify data word 53 bit 1 doesn't cover words 62 and 63 (take 3)
    au1xxx-ide: auide_{in|out}sw() should be static
    ide-floppy: use ide_pio_bytes()
    ide-{floppy,tape}: fix padding for PIO transfers
    ide: remove CONFIG_BLK_DEV_IDEDOUBLER config option
    ...

    Linus Torvalds
     

01 Apr, 2009

2 commits


31 Mar, 2009

2 commits


30 Mar, 2009

2 commits


29 Mar, 2009

3 commits

  • * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (422 commits)
    [ARM] 5435/1: fix compile warning in sanity_check_meminfo()
    [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
    [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
    [ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
    imxfb: Fix TFT mode
    i.MX21/27: remove ifdef CONFIG_FB_IMX
    imxfb: add clock support
    mxc: add arch_reset() function
    clkdev: add possibility to get a clock based on the device name
    i.MX1: remove fb support from mach-imx
    [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
    Gemini: Add support for Teltonika RUT100
    Gemini: gpiolib based GPIO support v2
    MAINTAINERS: add myself as Gemini architecture maintainer
    ARM: Add Gemini architecture v3
    [ARM] OMAP: Fix compile for omap2_init_common_hw()
    MAINTAINERS: Add myself as Faraday ARM core variant maintainer
    ARM: Add support for FA526 v2
    [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
    [ARM] collie: fix two minor formatting nits
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (119 commits)
    [SCSI] scsi_dh_rdac: Retry for NOT_READY check condition
    [SCSI] mpt2sas: make global symbols unique
    [SCSI] sd: Make revalidate less chatty
    [SCSI] sd: Try READ CAPACITY 16 first for SBC-2 devices
    [SCSI] sd: Refactor sd_read_capacity()
    [SCSI] mpt2sas v00.100.11.15
    [SCSI] mpt2sas: add MPT2SAS_MINOR(221) to miscdevice.h
    [SCSI] ch: Add scsi type modalias
    [SCSI] 3w-9xxx: add power management support
    [SCSI] bsg: add linux/types.h include to bsg.h
    [SCSI] cxgb3i: fix function descriptions
    [SCSI] libiscsi: fix possbile null ptr session command cleanup
    [SCSI] iscsi class: remove host no argument from session creation callout
    [SCSI] libiscsi: pass session failure a session struct
    [SCSI] iscsi lib: remove qdepth param from iscsi host allocation
    [SCSI] iscsi lib: have lib create work queue for transmitting IO
    [SCSI] iscsi class: fix lock dep warning on logout
    [SCSI] libiscsi: don't cap queue depth in iscsi modules
    [SCSI] iscsi_tcp: replace scsi_debug/tcp_debug logging with iscsi conn logging
    [SCSI] libiscsi_tcp: replace tcp_debug/scsi_debug logging with session/conn logging
    ...

    Linus Torvalds
     
  • Conflicts:
    sound/soc/pxa/pxa2xx-i2s.c

    Russell King
     

28 Mar, 2009

2 commits


27 Mar, 2009

6 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
    m68k: irq_node.handler() should return irqreturn_t
    m68k: section mismatch fixes: Atari SCSI
    m68k: section mismatch fixes: DMAsound for Atari
    MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository
    m68k: mac - Add SWIM floppy support
    m68k: mac - Add a new entry in mac_model to identify the floppy controller type.
    m68k: Add install target

    Linus Torvalds
     
  • Conflicts:
    arch/arm/mm/Kconfig

    Signed-off-by: Russell King

    Russell King
     
  • * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (81 commits)
    [S390] remove duplicated #includes
    [S390] cpumask: use mm_cpumask() wrapper
    [S390] cpumask: Use accessors code.
    [S390] cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.
    [S390] cpumask: remove cpu_coregroup_map
    [S390] fix clock comparator save area usage
    [S390] Add hwcap flag for the etf3 enhancement facility
    [S390] Ensure that ipl panic notifier is called late.
    [S390] fix dfp elf hwcap/facility bit detection
    [S390] smp: perform initial cpu reset before starting a cpu
    [S390] smp: fix memory leak on __cpu_up
    [S390] ipl: Improve checking logic and remove switch defaults.
    [S390] s390dbf: Remove needless check for NULL pointer.
    [S390] s390dbf: Remove redundant initilizations.
    [S390] use kzfree()
    [S390] BUG to BUG_ON changes
    [S390] zfcpdump: Prevent zcore from beeing built as a kernel module.
    [S390] Use csum_partial in checksum.h
    [S390] cleanup lowcore.h
    [S390] eliminate ipl_device from lowcore
    ...

    Linus Torvalds
     
  • Conflicts:
    drivers/net/wimax/i2400m/usb-notif.c

    David S. Miller
     
  • CVS is dead, long live git!

    Signed-off-by: Geert Uytterhoeven

    Geert Uytterhoeven
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (29 commits)
    crypto: sha512-s390 - Add missing block size
    hwrng: timeriomem - Breaks an allyesconfig build on s390:
    nlattr: Fix build error with NET off
    crypto: testmgr - add zlib test
    crypto: zlib - New zlib crypto module, using pcomp
    crypto: testmgr - Add support for the pcomp interface
    crypto: compress - Add pcomp interface
    netlink: Move netlink attribute parsing support to lib
    crypto: Fix dead links
    hwrng: timeriomem - New driver
    crypto: chainiv - Use kcrypto_wq instead of keventd_wq
    crypto: cryptd - Per-CPU thread implementation based on kcrypto_wq
    crypto: api - Use dedicated workqueue for crypto subsystem
    crypto: testmgr - Test skciphers with no IVs
    crypto: aead - Avoid infinite loop when nivaead fails selftest
    crypto: skcipher - Avoid infinite loop when cipher fails selftest
    crypto: api - Fix crypto_alloc_tfm/create_create_tfm return convention
    crypto: api - crypto_alg_mod_lookup either tested or untested
    crypto: amcc - Add crypt4xx driver
    crypto: ansi_cprng - Add maintainer
    ...

    Linus Torvalds
     

26 Mar, 2009

3 commits


25 Mar, 2009

3 commits


24 Mar, 2009

1 commit


23 Mar, 2009

2 commits


18 Mar, 2009

1 commit


16 Mar, 2009

2 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
    r8169: revert "r8169: read MAC address from EEPROM on init (2nd attempt)"
    r8169: use hardware auto-padding.
    igb: remove ASPM L0s workaround
    netxen: remove old flash check.
    mv643xx_eth: fix unicast address filter corruption on mtu change
    xfrm: Fix xfrm_state_find() wrt. wildcard source address.
    emac: Fix clock control for 405EX and 405EXr chips
    ixgbe: fix multiple unicast address support
    via-velocity: Fix DMA mapping length errors on transmit.
    qlge: bugfix: Pad outbound frames smaller than 60 bytes.
    qlge: bugfix: Move netif_napi_del() to common call point.
    qlge: bugfix: Tell hw to strip vlan header.
    qlge: bugfix: Increase filter on inbound csum.
    dnet: replace obsolete *netif_rx_* functions with *napi_*
    net: Add be2net driver.
    dnet: Fix warnings on 64-bit.
    dnet: Dave DNET ethernet controller driver (updated)
    ipv6: Fix BUG when disabled ipv6 module is unloaded
    bnx2x: Using DMAE to initialize the chip
    bnx2x: Casting page alignment
    ...

    Linus Torvalds
     
  • Felix Blyakher
     

14 Mar, 2009

1 commit


13 Mar, 2009

2 commits

  • Signed-off-By: Grant Grundler
    Reviewed-by: Matthew Wilcox
    Acked-by: Helge Deller
    Signed-off-by: Kyle McMartin

    Grant Grundler
     
  • Unfortunately, Linux Foundation funding for my work on
    man-pages/testing/doc under the auspices of the LF documentation
    fellowship unfortunately ran out a short while ago (after earlier attempts
    to seek funding, only Google stepped forward with a bit of further funding
    for the position), so the patch below acknowledges something closer to
    reality.

    Unfortunately, there will (probably very) soon be a further downgrade from
    "Maintained" to "Odd Fixes" or "Orphan", unless some funding miracle
    occurs. So, if anyone is looking to become man-pages maintainer, there
    may soon be an opening (okay, don't trample me in the rush ;-).)

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

    Michael Kerrisk