22 Oct, 2010

3 commits

  • * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (278 commits)
    arm: remove machine_desc.io_pg_offst and .phys_io
    arm: use addruart macro to establish debug mappings
    arm: return both physical and virtual addresses from addruart
    arm/debug: consolidate addruart macros for CONFIG_DEBUG_ICEDCC
    ARM: make struct machine_desc definition coherent with its comment
    eukrea_mbimxsd-baseboard: Pass the correct GPIO to gpio_free
    cpuimx27: fix compile when ULPI is selected
    mach-pcm037_eet: fix compile errors
    Fixing ethernet driver compilation error for i.MX31 ADS board
    cpuimx51: update board support
    mx5: add cpuimx51sd module and its baseboard
    iomux-mx51: fix GPIO_1_xx 's IOMUX configuration
    imx-esdhc: update devices registration
    mx51: add resources for SD/MMC on i.MX51
    iomux-mx51: fix SD1 and SD2's iomux configuration
    clock-mx51: rename CLOCK1 to CLOCK_CCGR for better readability
    clock-mx51: factorize clk_set_parent and clk_get_rate
    eukrea_mbimxsd: add support for DVI displays
    cpuimx25 & cpuimx35: fix OTG port registration in host mode
    i.MX31 and i.MX35 : fix errate TLSbo65953 and ENGcm09472
    ...

    Linus Torvalds
     
  • * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (96 commits)
    apic, x86: Use BIOS settings for IBS and MCE threshold interrupt LVT offsets
    apic, x86: Check if EILVT APIC registers are available (AMD only)
    x86: ioapic: Call free_irte only if interrupt remapping enabled
    arm: Use ARCH_IRQ_INIT_FLAGS
    genirq, ARM: Fix boot on ARM platforms
    genirq: Fix CONFIG_GENIRQ_NO_DEPRECATED=y build
    x86: Switch sparse_irq allocations to GFP_KERNEL
    genirq: Switch sparse_irq allocator to GFP_KERNEL
    genirq: Make sparse_lock a mutex
    x86: lguest: Use new irq allocator
    genirq: Remove the now unused sparse irq leftovers
    genirq: Sanitize dynamic irq handling
    genirq: Remove arch_init_chip_data()
    x86: xen: Sanitise sparse_irq handling
    x86: Use sane enumeration
    x86: uv: Clean up the direct access to irq_desc
    x86: Make io_apic.c local functions static
    genirq: Remove irq_2_iommu
    x86: Speed up the irq_remapped check in hot pathes
    intr_remap: Simplify the code further
    ...

    Fix up trivial conflicts in arch/x86/Kconfig

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (22 commits)
    ceph: do not carry i_lock for readdir from dcache
    fs/ceph/xattr.c: Use kmemdup
    rbd: passing wrong variable to bvec_kunmap_irq()
    rbd: null vs ERR_PTR
    ceph: fix num_pages_free accounting in pagelist
    ceph: add CEPH_MDS_OP_SETDIRLAYOUT and associated ioctl.
    ceph: don't crash when passed bad mount options
    ceph: fix debugfs warnings
    block: rbd: removing unnecessary test
    block: rbd: fixed may leaks
    ceph: switch from BKL to lock_flocks()
    ceph: preallocate flock state without locks held
    ceph: add pagelist_reserve, pagelist_truncate, pagelist_set_cursor
    ceph: use mapping->nrpages to determine if mapping is empty
    ceph: only invalidate on check_caps if we actually have pages
    ceph: do not hide .snap in root directory
    rbd: introduce rados block device (rbd), based on libceph
    ceph: factor out libceph from Ceph file system
    ceph-rbd: osdc support for osd call and rollback operations
    ceph: messenger and osdc changes for rbd
    ...

    Linus Torvalds
     

21 Oct, 2010

3 commits

  • The rados block device (rbd), based on osdblk, creates a block device
    that is backed by objects stored in the Ceph distributed object storage
    cluster. Each device consists of a single metadata object and data
    striped over many data objects.

    The rbd driver supports read-only snapshots.

    Signed-off-by: Yehuda Sadeh
    Signed-off-by: Sage Weil

    Yehuda Sadeh
     
  • This factors out protocol and low-level storage parts of ceph into a
    separate libceph module living in net/ceph and include/linux/ceph. This
    is mostly a matter of moving files around. However, a few key pieces
    of the interface change as well:

    - ceph_client becomes ceph_fs_client and ceph_client, where the latter
    captures the mon and osd clients, and the fs_client gets the mds client
    and file system specific pieces.
    - Mount option parsing and debugfs setup is correspondingly broken into
    two pieces.
    - The mon client gets a generic handler callback for otherwise unknown
    messages (mds map, in this case).
    - The basic supported/required feature bits can be expanded (and are by
    ceph_fs_client).

    No functional change, aside from some subtle error handling cases that got
    cleaned up in the refactoring process.

    Signed-off-by: Sage Weil

    Yehuda Sadeh
     
  • * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
    MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls.
    MAINTAINERS: Change list for ioc_serial to linux-serial.
    SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure
    MIPS: jz4740: Fix Kbuild Platform file.
    MIPS: Repair Kbuild make clean breakage.

    Linus Torvalds
     

20 Oct, 2010

3 commits


18 Oct, 2010

1 commit


12 Oct, 2010

2 commits


11 Oct, 2010

1 commit


10 Oct, 2010

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
    net: clear heap allocation for ETHTOOL_GRXCLSRLALL
    isdn: strcpy() => strlcpy()
    Revert "mac80211: use netif_receive_skb in ieee80211_tx_status callpath"
    mac80211: delete AddBA response timer
    ath9k_hw: fix regression in ANI listen time calculation
    caif: fix two caif_connect() bugs
    bonding: fix WARN_ON when writing to bond_master sysfs file
    skge: add quirk to limit DMA
    MAINTAINERS: update Intel LAN Ethernet info
    e1000e.txt: Add e1000e documentation
    e1000.txt: Update e1000 documentation
    ixgbevf.txt: Update ixgbevf documentation
    cls_u32: signedness bug
    Bluetooth: Disallow to change L2CAP_OPTIONS values when connected
    sctp: Fix out-of-bounds reading in sctp_asoc_get_hmac()
    sctp: prevent reading out-of-bounds memory
    ipv4: correct IGMP behavior on v3 query during v2-compatibility mode
    netdev: Depend on INET before selecting INET_LRO
    Revert "ipv4: Make INET_LRO a bool instead of tristate."
    net: Fix the condition passed to sk_wait_event()
    ...

    Linus Torvalds
     

09 Oct, 2010

1 commit


08 Oct, 2010

3 commits


07 Oct, 2010

1 commit


06 Oct, 2010

3 commits


05 Oct, 2010

1 commit


02 Oct, 2010

2 commits

  • Signed-off-by: Kukjin Kim
    Acked-by: Ben Dooks
    Acked-by: Russell King
    Cc: Kyungmin Park
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kukjin Kim
     
  • I moved couple years ago, so let's update my email and snail mail.

    And I do not have any access to Matrox hardware anymore, and I'm quite
    unresponsive to matroxfb bug reports (sorry Alan), so saying that I'm
    maintainer is a bit far fetched.

    For ncpfs I do not use ncpfs in my daily life either, but at least I can
    test that one, so I can stay listed here for odd fixes.

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

    Petr Vandrovec
     

27 Sep, 2010

1 commit


25 Sep, 2010

2 commits


24 Sep, 2010

1 commit

  • Change MSI LAPTOP driver maintainer from Lennart Poettering to Lee, Chun-Yi.

    MSI is a Taiwan OEM company, Lee, Chun-Yi can more easy to contact with MSI
    and maintain msi-laptop driver.
    Thank's for Lennart Poettering's contribute, Lee, Chun-Yi will base on his
    article to continue maintain the msi-laptop driver.

    Signed-off-by: Lee, Chun-Yi
    Signed-off-by: Matthew Garrett

    Lee, Chun-Yi
     

23 Sep, 2010

2 commits

  • Some Apple machines have identical DMI data but different memory
    configurations for the video. Given that, check that the address in our
    table is actually within the range of a PCI BAR on a VGA device in the
    machine.

    This also fixes up the return value from set_system(), which has always
    been wrong, but never resulted in bad behavior since there's only ever
    been one matching entry in the dmi table.

    The patch

    1) stops people's machines from crashing when we get their display wrong,
    which seems to be unfortunately inevitable,

    2) allows us to support identical dmi data with differing video memory
    configurations

    This also adds me as the efifb maintainer, since I've effectively been
    acting as such for quite some time.

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

    Peter Jones
     
  • Alter the maintainer of the AVR32 architecture and the AVR32/AT32AP
    machine support to me. Haavard is moving on to new challenges, and we've
    found it better to transfer the maintainer part to me. I will have good
    contact with Haavard anyway.

    Signed-off-by: Hans-Christian Egtvedt
    Acked-by: Haavard Skinnemoen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hans-Christian Egtvedt
     

21 Sep, 2010

2 commits


20 Sep, 2010

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
    dca: disable dca on IOAT ver.3.0 multiple-IOH platforms
    netpoll: Disable IRQ around RCU dereference in netpoll_rx
    sctp: Do not reset the packet during sctp_packet_config().
    net/llc: storing negative error codes in unsigned short
    MAINTAINERS: move atlx discussions to netdev
    drivers/net/cxgb3/cxgb3_main.c: prevent reading uninitialized stack memory
    drivers/net/eql.c: prevent reading uninitialized stack memory
    drivers/net/usb/hso.c: prevent reading uninitialized memory
    xfrm: dont assume rcu_read_lock in xfrm_output_one()
    r8169: Handle rxfifo errors on 8168 chips
    3c59x: Remove atomic context inside vortex_{set|get}_wol
    tcp: Prevent overzealous packetization by SWS logic.
    net: RPS needs to depend upon USE_GENERIC_SMP_HELPERS
    phylib: fix PAL state machine restart on resume
    net: use rcu_barrier() in rollback_registered_many
    bonding: correctly process non-linear skbs
    ipv4: enable getsockopt() for IP_NODEFRAG
    ipv4: force_igmp_version ignored when a IGMPv3 query received
    ppp: potential NULL dereference in ppp_mp_explode()
    net/llc: make opt unsigned in llc_ui_setsockopt()
    ...

    Linus Torvalds
     

18 Sep, 2010

1 commit


17 Sep, 2010

2 commits

  • Guenter Roeck volunteered to adopt the hwmon subsystem as long as he
    wasn't the only maintainer. As this was also my own condition, we can
    add the two of us as co-maintainers of the hwmon subsystem.

    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • The atlx drivers are sufficiently mature that we no longer need a separate
    mailing list for them. Move the discussion to netdev, so we can decommission
    atl1-devel, which is now mostly spam.

    Signed-off-by: Chris Snook
    Signed-off-by: David S. Miller

    Chris Snook
     

11 Sep, 2010

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (28 commits)
    ipheth: remove incorrect devtype to WWAN
    MAINTAINERS: Add CAIF
    sctp: fix test for end of loop
    KS8851: Correct RX packet allocation
    udp: add rehash on connect()
    net: blackhole route should always be recalculated
    ipv4: Suppress lockdep-RCU false positive in FIB trie (3)
    niu: Fix kernel buffer overflow for ETHTOOL_GRXCLSRLALL
    ipvs: fix active FTP
    gro: Re-fix different skb headrooms
    via-velocity: Turn scatter-gather support back off.
    ipv4: Fix reverse path filtering with multipath routing.
    UNIX: Do not loop forever at unix_autobind().
    PATCH: b44 Handle RX FIFO overflow better (simplified)
    irda: off by one
    3c59x: Fix deadlock in vortex_error()
    netfilter: discard overlapping IPv6 fragment
    ipv6: discard overlapping fragment
    net: fix tx queue selection for bridged devices implementing select_queue
    bonding: Fix jiffies overflow problems (again)
    ...

    Fix up trivial conflicts due to the same cgroup API thinko fix going
    through both Andrew and the networking tree. However, there were small
    differences between the two, with Andrew's version generally being the
    nicer one, and the one I merged first. So pick that one.

    Conflicts in: include/linux/cgroup.h and kernel/cgroup.c

    Linus Torvalds
     

10 Sep, 2010

2 commits