24 May, 2013

3 commits

  • Pull networking fixes from David Miller:
    "It's been a while since my last pull request so quite a few fixes have
    piled up."

    Indeed.

    1) Fix nf_{log,queue} compilation with PROC_FS disabled, from Pablo
    Neira Ayuso.

    2) Fix data corruption on some tg3 chips with TSO enabled, from Michael
    Chan.

    3) Fix double insertion of VLAN tags in be2net driver, from Sarveshwar
    Bandi.

    4) Don't have TCP's MD5 support pass > PAGE_SIZE page offsets in
    scatter-gather entries into the crypto layer, the crypto layer can't
    handle that. From Eric Dumazet.

    5) Fix lockdep splat in 802.1Q MRP code, also from Eric Dumazet.

    6) Fix OOPS in netfilter log module when called from conntrack, from
    Hans Schillstrom.

    7) FEC driver needs to use netif_tx_{lock,unlock}_bh() rather than the
    non-BH disabling variants. From Fabio Estevam.

    8) TCP GSO can generate out-of-order packets, fix from Eric Dumazet.

    9) vxlan driver doesn't update 'used' field of fdb entries when it
    should, from Sridhar Samudrala.

    10) ipv6 should use kzalloc() to allocate inet6 socket cork options,
    otherwise we can OOPS in ip6_cork_release(). From Eric Dumazet.

    11) Fix races in bonding set mode, from Nikolay Aleksandrov.

    12) Fix checksum generation regression added by "r8169: fix 8168evl
    frame padding.", from Francois Romieu.

    13) ip_gre can look at stale SKB data pointer, fix from Eric Dumazet.

    14) Fix checksum handling when GSO is enabled in bnx2x driver with
    certain chips, from Yuval Mintz.

    15) Fix double free in batman-adv, from Martin Hundebøll.

    16) Fix device startup synchronization with firmware in tg3 driver, from
    Nithin Sujit.

    17) perf networking dropmonitor doesn't work at all due to mixed up
    trace parameter ordering, from Ben Hutchings.

    18) Fix proportional rate reduction handling in tcp_ack(), from Nandita
    Dukkipati.

    19) IPSEC layer doesn't return an error when a valid state is detected,
    causing an OOPS. Fix from Timo Teräs.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (85 commits)
    be2net: bug fix on returning an invalid nic descriptor
    tcp: xps: fix reordering issues
    net: Revert unused variable changes.
    xfrm: properly handle invalid states as an error
    virtio_net: enable napi for all possible queues during open
    tcp: bug fix in proportional rate reduction.
    net: ethernet: sun: drop unused variable
    net: ethernet: korina: drop unused variable
    net: ethernet: apple: drop unused variable
    qmi_wwan: Added support for Cinterion's PLxx WWAN Interface
    perf: net_dropmonitor: Remove progress indicator
    perf: net_dropmonitor: Use bisection in symbol lookup
    perf: net_dropmonitor: Do not assume ordering of dictionaries
    perf: net_dropmonitor: Fix symbol-relative addresses
    perf: net_dropmonitor: Fix trace parameter order
    net: fec: use a more proper compatible string for MVF type device
    qlcnic: Fix updating netdev->features
    qlcnic: remove netdev->trans_start updates within the driver
    qlcnic: Return proper error codes from probe failure paths
    tg3: Update version to 3.132
    ...

    Linus Torvalds
     
  • Pull char/misc driver fixes from Greg Kroah-Hartman:
    "Here are some small char/misc driver fixes for 3.10-rc2.

    Nothing major here, just a number of fixes for things that people have
    reported, and a MAINTAINERS update for the recent changes for the
    hyperv files that went into 3.10-rc1."

    * tag 'char-misc-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
    ttyprintk: Fix NULL pointer deref by setting tty_port ops after initializing port
    uio: UIO_DMEM_GENIRQ should depend on HAS_DMA
    MAINTAINERS: update Hyper-V file list
    mei: bus: Reset event_cb when disabling a device
    Drivers: hv: Fix a bug in get_vp_index()
    mei: fix out of array access to me clients array
    Char: lp, protect LPGETSTATUS with port_mutex
    dummy-irq: require the user to specify an IRQ number

    Linus Torvalds
     
  • Pull kvm bugfixes from Gleb Natapov.

    * git://git.kernel.org/pub/scm/virt/kvm/kvm:
    KVM/MIPS32: Wrap calls to gfn_to_pfn() with srcu_read_lock/unlock()
    KVM/MIPS32: Move include/asm/kvm.h => include/uapi/asm/kvm.h since it is a user visible API.
    KVM: take over co-maintainership from Marcelo, fix MAINTAINERS entry

    Linus Torvalds
     

22 May, 2013

1 commit


21 May, 2013

1 commit

  • Pull hwmon fixes from Guenter Roeck:

    - Error path fixes for abituguru and iio_hwmon drivers.

    - Drop erroneously created attributes from nct6775 driver.

    - Drop redundant safety on cache lifetime for tmp401 driver.

    - Add explicit maintainer for LM95234 and TMP401 drivers.

    * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
    MAINTAINERS: Add myself as maintainer for LM95234 and TMP401 drivers
    hwmon: (tmp401) Drop redundant safety on cache lifetime
    hwmon: fix error return code in abituguru_probe()
    hwmon: (iio_hwmon) Fix null pointer dereference
    hwmon: (nct6775) Do not create non-existing attributes
    hwmon: (iio_hwmon) Fix missing iio_channel_release_all call if devm_kzalloc fail

    Linus Torvalds
     

20 May, 2013

1 commit


19 May, 2013

1 commit


17 May, 2013

1 commit

  • Pablo Neira Ayuso says:

    ====================
    The following patchset contains three Netfilter fixes and update
    for the MAINTAINER file for your net tree, they are:

    * Fix crash if nf_log_packet is called from conntrack, in that case
    both interfaces are NULL, from Hans Schillstrom. This bug introduced
    with the logging netns support in the previous merge window.

    * Fix compilation of nf_log and nf_queue without CONFIG_PROC_FS,
    from myself. This bug was introduced in the previous merge window
    with the new netns support for the netfilter logging infrastructure.

    * Fix possible crash in xt_TCPOPTSTRIP due to missing sanity
    checkings to validate that the TCP header is well-formed, from
    myself. I can find this bug in 2.6.25, probably it's been there
    since the beginning. I'll pass this to -stable.

    * Update MAINTAINER file to point to new nf trees at git.kernel.org,
    remove Harald and use M: instead of P: (now obsolete tag) to
    keep Jozsef in the list of people.

    Please, consider pulling this. Thanks!
    ====================

    Signed-off-by: David S. Miller

    David S. Miller
     

16 May, 2013

1 commit

  • Pull target fixes from Nicholas Bellinger:
    "A handful of fixes + minor changes this time around, along with one
    important >= v3.9 regression fix for IBLOCK backends. The highlights
    include:

    - Use FD_MAX_SECTORS in FILEIO for block_device as
    well as files (agrover)

    - Fix processing of out-of-order CmdSNs with
    iSBD driver (shlomo)

    - Close long-standing target_put_sess_cmd() vs.
    core_tmr_abort_task() race with the addition of
    kref_put_spinlock_irqsave() (joern + greg-kh)

    - Fix IBLOCK WCE=1 + DPOFUA=1 backend WRITE
    regression in >= v3.9 (nab + bootc)

    Note these four patches are CC'ed to stable.

    Also, there is still some work left to be done on the active I/O
    shutdown path in target_wait_for_sess_cmds() used by tcm_qla2xxx +
    ib_isert fabrics that is still being discussed on the list, and will
    hopefully be resolved soon."

    * 'queue' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
    target: close target_put_sess_cmd() vs. core_tmr_abort_task() race
    target: removed unused transport_state flag
    target/iblock: Fix WCE=1 + DPOFUA=1 backend WRITE regression
    MAINTAINERS: Update target git tree URL
    iscsi-target: Fix typos in RDMAEXTENSIONS macro usage
    target/rd: Add ramdisk bit for NULLIO operation
    iscsi-target: Fix processing of OOO commands
    iscsi-target: Make buf param of iscsit_do_crypto_hash_buf() const void *
    iscsi-target: Fix NULL pointer dereference in iscsit_send_reject
    target: Have dev/enable show if TCM device is configured
    target: Use FD_MAX_SECTORS/FD_BLOCKSIZE for blockdevs using fileio
    target: Remove unused struct members in se_dev_entry

    Linus Torvalds
     

12 May, 2013

1 commit


10 May, 2013

1 commit

  • Pull thermal management update from Zhang Rui:
    "The most important one is to build thermal core and governor and cpu
    cooling code into one module. This fixes a regression that thermal
    core does not work if it is built as module, since 3.7. I'll backport
    them to stable kernel once those changes are in upstream.

    The largest batch is the thermal kernel-doc & coding style
    updates/cleanups from Eduardo.

    Highlights:

    - build all thermal framework code into one module to fix a
    regression that thermal does not work if it is built as module.

    - Marvell Armada 370/XP thermal sensor driver

    - thermal core/cpu cooling kernel-doc & coding style updates and
    cleanups.

    - Add Eduardo Valentin as thermal sub-maintainer, both in mailing
    list and patchwork. He will help me on arm thermal drivers."

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (68 commits)
    thermal: db8500_cpufreq_cooling: remove usage of IS_ERR_OR_NULL()
    thermal: thermal_core: remove usage of IS_ERR_OR_NULL
    thermal: cpu_cooling: improve line breaking
    thermal: cpu_cooling: alignment improvements
    thermal: cpu_cooling: remove checkpatch.pl warning
    thermal: cpu_cooling: remove trailing blank line
    thermal: cpu_cooling: align on open parenthesis
    thermal: cpu_cooling: standardize comment style
    thermal: cpu_cooling: standardize end of function
    thermal: cpu_cooling: remove trailing white spaces
    Thermal: update documentation for thermal_zone_device_register
    thermal: update kernel-doc for thermal_zone_device_register
    thermal: update kernel-doc for create_trip_attrs
    thermal: update kernel-doc for thermal_cooling_device_register
    thermal: update kernel-doc for thermal_zone_unbind_cooling_device
    thermal: update kernel-doc for thermal_zone_bind_cooling_device
    thermal: use EXPORT_SYMBOL_GPL
    thermal: rename notify_thermal_framework to thermal_notify_framework
    thermal: update driver license
    thermal: use strlcpy instead of strcpy
    ...

    Linus Torvalds
     

09 May, 2013

1 commit

  • Pull block driver updates from Jens Axboe:
    "It might look big in volume, but when categorized, not a lot of
    drivers are touched. The pull request contains:

    - mtip32xx fixes from Micron.

    - A slew of drbd updates, this time in a nicer series.

    - bcache, a flash/ssd caching framework from Kent.

    - Fixes for cciss"

    * 'for-3.10/drivers' of git://git.kernel.dk/linux-block: (66 commits)
    bcache: Use bd_link_disk_holder()
    bcache: Allocator cleanup/fixes
    cciss: bug fix to prevent cciss from loading in kdump crash kernel
    cciss: add cciss_allow_hpsa module parameter
    drivers/block/mg_disk.c: add CONFIG_PM_SLEEP to suspend/resume functions
    mtip32xx: Workaround for unaligned writes
    bcache: Make sure blocksize isn't smaller than device blocksize
    bcache: Fix merge_bvec_fn usage for when it modifies the bvm
    bcache: Correctly check against BIO_MAX_PAGES
    bcache: Hack around stuff that clones up to bi_max_vecs
    bcache: Set ra_pages based on backing device's ra_pages
    bcache: Take data offset from the bdev superblock.
    mtip32xx: mtip32xx: Disable TRIM support
    mtip32xx: fix a smatch warning
    bcache: Disable broken btree fuzz tester
    bcache: Fix a format string overflow
    bcache: Fix a minor memory leak on device teardown
    bcache: Documentation updates
    bcache: Use WARN_ONCE() instead of __WARN()
    bcache: Add missing #include
    ...

    Linus Torvalds
     

08 May, 2013

2 commits

  • Pull rpmsg changes from Ohad Ben-Cohen:
    "A small pull request consisting of:

    - Make rpmsg process all pending messages instead of just one, from
    Robert Tivy

    - Fix Kconfig dependency on VIRTUALIZATION, from Suman.

    Note: this was submitted late during the 3.9 rc cycle and it seemed
    appropriate to wait with it for the merge window.

    - Belated addition of an rpmsg entry to the MAINTAINERS file. People
    seem to look for this"

    * tag 'rpmsg-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg:
    rpmsg: fix kconfig dependencies for VIRTIO
    MAINTAINERS: add rpmsg entry
    rpmsg: process _all_ pending messages in rpmsg_recv_done

    Linus Torvalds
     
  • Jeff is leaving for something more interesting and I'm inheriting the
    maintainership of libata. Thanks a lot for the good work and have
    fun, Jeff!

    v2: The original path forgot to update git tree URL. Updated.
    Spotted by Sergei.

    Signed-off-by: Tejun Heo
    Cc: Jeff Garzik
    Cc: Sergei Shtylyov

    Tejun Heo
     

06 May, 2013

1 commit

  • * Remove reference to ipchains (not any longer in the tree)
    * Remove all P: (person) as this tag is obsolete according to the
    description. Therefore, update Jozsef Kadlecsik to M: so he can
    still show in the list of people.
    * Add URI to Netfilter's patchwork at ozlabs.org
    * Update URIs to Netfilter's git trees to point to kernel.org.

    Signed-off-by: Pablo Neira Ayuso

    Pablo Neira Ayuso
     

05 May, 2013

1 commit

  • Pull MMC update from Chris Ball:
    "MMC highlights for 3.10:

    Core:
    - Introduce MMC_CAP2_NO_PRESCAN_POWERUP to allow skipping
    mmc_power_up() at boot/initialization time if it's already
    happened, for performance (faster boot time) reasons.
    - Fix a bit width test failure that resulted in old eMMC cards being
    put into 1-bit mode when 4-bit mode was available.
    - Expose fwrev/hwrev for MMCv4 parts.
    - Improve card removal logic in the case where the card's removed
    slowly; we were missing card removal events if the card retained
    contact with the slot pads for long enough to reply to a CMD13
    while being removed.

    Drivers:
    - davinci_mmc: Support using PIO instead of DMA.
    - dw_mmc: Add support for Exynos4412.
    - mxcmmc: DT support, use slot-gpio API.
    - mxs-mmc: Add broken-cd/cd-inverted/non-removable DT property
    support.
    - sdhci-sirf: New sdhci-pltfm driver for CSR SiRF SoCs:
    SiRFprimaII: unicore ARM Cortex-A9
    SiRFatlas6: unicore ARM Cortex-A9
    SiRFmarco: dual core ARM Cortex-A9 SMP
    - sdhci-tegra: Add support for Tegra114 platforms, use
    mmc_of_parse()"

    * tag 'mmc-updates-for-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (66 commits)
    mmc: sdhci-tegra: fix MODULE_DEVICE_TABLE
    mmc: core: fix init controller performance regression, updated patch
    mmc: mxcmmc: enable DMA support on mpc512x
    mmc: mxcmmc: constify mxcmci_devtype
    mmc: mxcmmc: use slot-gpio API for write-protect detection
    mmc: mxcmmc: add mpc512x SDHC support
    mmc: mxcmmc: fix race conditions for host->req and host->data access
    mmc: mxcmmc: DT support
    mmc: dw_mmc: let device core setup the default pin configuration
    mmc: mxs-mmc: add broken-cd property
    mmc: mxs-mmc: add non-removable property
    mmc: mxs-mmc: add cd-inverted property
    mmc: core: call pm_runtime_put_noidle in pm_runtime_get_sync failed case
    mmc: mxcmmc: Fix bug when card is present during boot
    mmc: core: fix performance regression initializing MMC host controllers
    Revert "mmc: core: wait while adding MMC host to ensure root mounts successfully"
    mmc: atmel-mci: pio hang on block errors
    mmc: core: Fix bit width test failing on old eMMC cards
    mmc: dw_mmc: Use pr_info instead of printk
    mmc: dw_mmc: Check return value of regulator_enable
    ...

    Linus Torvalds
     

03 May, 2013

2 commits

  • Pull i2c changes from Wolfram Sang:

    - an arbitration driver. While the driver is quite simple, it caused
    discussion if we need additional arbitration on top of the one
    specified in the I2C standard. Conclusion is that I accept a few
    generic mechanisms, but not very specific ones.

    - the core lost the detach_adapter() call. It has no users anymore and
    was in the way for other cleanups. attach_adapter() is sadly still
    there since there are users waiting to be converted.

    - the core gained a bus recovery infrastructure. I2C defines a way to
    recover if the data line is stalled. This mechanism is now in the
    core and drivers can now pass some data to make use of it.

    - bigger driver cleanups for designware, s3c2410

    - removing superfluous refcounting from drivers

    - removing Ben Dooks as second maintainer due to inactivity. Thanks
    for all your work so far, Ben!

    - bugfixes, feature additions, devicetree fixups, simplifications...

    * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (38 commits)
    i2c: xiic: must always write 16-bit words to TX_FIFO
    i2c: octeon: use HZ in timeout value
    i2c: octeon: Fix i2c fail problem when a process is terminated by a signal
    i2c: designware-pci: drop superfluous {get|put}_device
    i2c: designware-plat: drop superfluous {get|put}_device
    i2c: davinci: drop superfluous {get|put}_device
    MAINTAINERS: Ben Dooks is inactive regarding I2C
    i2c: mux: Add i2c-arb-gpio-challenge 'mux' driver
    i2c: at91: convert to dma_request_slave_channel_compat()
    i2c: mxs: do error checking and handling in PIO mode
    i2c: mxs: remove races in PIO code
    i2c-designware: switch to use runtime PM autosuspend
    i2c-designware: use usleep_range() in the busy-loop
    i2c-designware: enable/disable the controller properly
    i2c-designware: use dynamic adapter numbering on Lynxpoint
    i2c-designware-pci: use managed functions pcim_* and devm_*
    i2c-designware-pci: use dev_err() instead of printk()
    i2c-designware: move to managed functions (devm_*)
    i2c: remove CONFIG_HOTPLUG ifdefs
    i2c: s3c2410: Add SMBus emulation for block read
    ...

    Linus Torvalds
     
  • Pull virtio & lguest updates from Rusty Russell:
    "Lots of virtio work which wasn't quite ready for last merge window.

    Plus I dived into lguest again, reworking the pagetable code so we can
    move the switcher page: our fixmaps sometimes take more than 2MB now..."

    Ugh. Annoying conflicts with the tcm_vhost -> vhost_scsi rename.
    Hopefully correctly resolved.

    * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (57 commits)
    caif_virtio: Remove bouncing email addresses
    lguest: improve code readability in lg_cpu_start.
    virtio-net: fill only rx queues which are being used
    lguest: map Switcher below fixmap.
    lguest: cache last cpu we ran on.
    lguest: map Switcher text whenever we allocate a new pagetable.
    lguest: don't share Switcher PTE pages between guests.
    lguest: expost switcher_pages array (as lg_switcher_pages).
    lguest: extract shadow PTE walking / allocating.
    lguest: make check_gpte et. al return bool.
    lguest: assume Switcher text is a single page.
    lguest: rename switcher_page to switcher_pages.
    lguest: remove RESERVE_MEM constant.
    lguest: check vaddr not pgd for Switcher protection.
    lguest: prepare to make SWITCHER_ADDR a variable.
    virtio: console: replace EMFILE with EBUSY for already-open port
    virtio-scsi: reset virtqueue affinity when doing cpu hotplug
    virtio-scsi: introduce multiqueue support
    virtio-scsi: push vq lock/unlock into virtscsi_vq_done
    virtio-scsi: pass struct virtio_scsi to virtqueue completion function
    ...

    Linus Torvalds
     

02 May, 2013

2 commits

  • Pull x86/efi changes from Peter Anvin:
    "The bulk of these changes are cleaning up the efivars handling and
    breaking it up into a tree of files. There are a number of fixes as
    well.

    The entire changeset is pretty big, but most of it is code movement.

    Several of these commits are quite new; the history got very messed up
    due to a mismerge with the urgent changes for rc8 which completely
    broke IA64, and so Ingo requested that we rebase it to straighten it
    out."

    * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    efi: remove "kfree(NULL)"
    efi: locking fix in efivar_entry_set_safe()
    efi, pstore: Read data from variable store before memcpy()
    efi, pstore: Remove entry from list when erasing
    efi, pstore: Initialise 'entry' before iterating
    efi: split efisubsystem from efivars
    efivarfs: Move to fs/efivarfs
    efivars: Move pstore code into the new EFI directory
    efivars: efivar_entry API
    efivars: Keep a private global pointer to efivars
    efi: move utf16 string functions to efi.h
    x86, efi: Make efi_memblock_x86_reserve_range more readable
    efivarfs: convert to use simple_open()

    Linus Torvalds
     
  • Pull networking updates from David Miller:
    "Highlights (1721 non-merge commits, this has to be a record of some
    sort):

    1) Add 'random' mode to team driver, from Jiri Pirko and Eric
    Dumazet.

    2) Make it so that any driver that supports configuration of multiple
    MAC addresses can provide the forwarding database add and del
    calls by providing a default implementation and hooking that up if
    the driver doesn't have an explicit set of handlers. From Vlad
    Yasevich.

    3) Support GSO segmentation over tunnels and other encapsulating
    devices such as VXLAN, from Pravin B Shelar.

    4) Support L2 GRE tunnels in the flow dissector, from Michael Dalton.

    5) Implement Tail Loss Probe (TLP) detection in TCP, from Nandita
    Dukkipati.

    6) In the PHY layer, allow supporting wake-on-lan in situations where
    the PHY registers have to be written for it to be configured.

    Use it to support wake-on-lan in mv643xx_eth.

    From Michael Stapelberg.

    7) Significantly improve firewire IPV6 support, from YOSHIFUJI
    Hideaki.

    8) Allow multiple packets to be sent in a single transmission using
    network coding in batman-adv, from Martin Hundebøll.

    9) Add support for T5 cxgb4 chips, from Santosh Rastapur.

    10) Generalize the VXLAN forwarding tables so that there is more
    flexibility in configurating various aspects of the endpoints.
    From David Stevens.

    11) Support RSS and TSO in hardware over GRE tunnels in bxn2x driver,
    from Dmitry Kravkov.

    12) Zero copy support in nfnelink_queue, from Eric Dumazet and Pablo
    Neira Ayuso.

    13) Start adding networking selftests.

    14) In situations of overload on the same AF_PACKET fanout socket, or
    per-cpu packet receive queue, minimize drop by distributing the
    load to other cpus/fanouts. From Willem de Bruijn and Eric
    Dumazet.

    15) Add support for new payload offset BPF instruction, from Daniel
    Borkmann.

    16) Convert several drivers over to mdoule_platform_driver(), from
    Sachin Kamat.

    17) Provide a minimal BPF JIT image disassembler userspace tool, from
    Daniel Borkmann.

    18) Rewrite F-RTO implementation in TCP to match the final
    specification of it in RFC4138 and RFC5682. From Yuchung Cheng.

    19) Provide netlink socket diag of netlink sockets ("Yo dawg, I hear
    you like netlink, so I implemented netlink dumping of netlink
    sockets.") From Andrey Vagin.

    20) Remove ugly passing of rtnetlink attributes into rtnl_doit
    functions, from Thomas Graf.

    21) Allow userspace to be able to see if a configuration change occurs
    in the middle of an address or device list dump, from Nicolas
    Dichtel.

    22) Support RFC3168 ECN protection for ipv6 fragments, from Hannes
    Frederic Sowa.

    23) Increase accuracy of packet length used by packet scheduler, from
    Jason Wang.

    24) Beginning set of changes to make ipv4/ipv6 fragment handling more
    scalable and less susceptible to overload and locking contention,
    from Jesper Dangaard Brouer.

    25) Get rid of using non-type-safe NLMSG_* macros and use nlmsg_*()
    instead. From Hong Zhiguo.

    26) Optimize route usage in IPVS by avoiding reference counting where
    possible, from Julian Anastasov.

    27) Convert IPVS schedulers to RCU, also from Julian Anastasov.

    28) Support cpu fanouts in xt_NFQUEUE netfilter target, from Holger
    Eitzenberger.

    29) Network namespace support for nf_log, ebt_log, xt_LOG, ipt_ULOG,
    nfnetlink_log, and nfnetlink_queue. From Gao feng.

    30) Implement RFC3168 ECN protection, from Hannes Frederic Sowa.

    31) Support several new r8169 chips, from Hayes Wang.

    32) Support tokenized interface identifiers in ipv6, from Daniel
    Borkmann.

    33) Use usbnet_link_change() helper in USB net driver, from Ming Lei.

    34) Add 802.1ad vlan offload support, from Patrick McHardy.

    35) Support mmap() based netlink communication, also from Patrick
    McHardy.

    36) Support HW timestamping in mlx4 driver, from Amir Vadai.

    37) Rationalize AF_PACKET packet timestamping when transmitting, from
    Willem de Bruijn and Daniel Borkmann.

    38) Bring parity to what's provided by /proc/net/packet socket dumping
    and the info provided by netlink socket dumping of AF_PACKET
    sockets. From Nicolas Dichtel.

    39) Fix peeking beyond zero sized SKBs in AF_UNIX, from Benjamin
    Poirier"

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1722 commits)
    filter: fix va_list build error
    af_unix: fix a fatal race with bit fields
    bnx2x: Prevent memory leak when cnic is absent
    bnx2x: correct reading of speed capabilities
    net: sctp: attribute printl with __printf for gcc fmt checks
    netlink: kconfig: move mmap i/o into netlink kconfig
    netpoll: convert mutex into a semaphore
    netlink: Fix skb ref counting.
    net_sched: act_ipt forward compat with xtables
    mlx4_en: fix a build error on 32bit arches
    Revert "bnx2x: allow nvram test to run when device is down"
    bridge: avoid OOPS if root port not found
    drivers: net: cpsw: fix kernel warn on cpsw irq enable
    sh_eth: use random MAC address if no valid one supplied
    3c509.c: call SET_NETDEV_DEV for all device types (ISA/ISAPnP/EISA)
    tg3: fix to append hardware time stamping flags
    unix/stream: fix peeking with an offset larger than data in queue
    unix/dgram: fix peeking with an offset larger than data in queue
    unix/dgram: peek beyond 0-sized skbs
    openvswitch: Remove unneeded ovs_netdev_get_ifindex()
    ...

    Linus Torvalds
     

01 May, 2013

3 commits

  • Pull power management and ACPI updates from Rafael J Wysocki:

    - ARM big.LITTLE cpufreq driver from Viresh Kumar.

    - exynos5440 cpufreq driver from Amit Daniel Kachhap.

    - cpufreq core cleanup and code consolidation from Viresh Kumar and
    Stratos Karafotis.

    - cpufreq scalability improvement from Nathan Zimmer.

    - AMD "frequency sensitivity feedback" powersave bias for the ondemand
    cpufreq governor from Jacob Shin.

    - cpuidle code consolidation and cleanups from Daniel Lezcano.

    - ARM OMAP cpuidle fixes from Santosh Shilimkar and Daniel Lezcano.

    - ACPICA fixes and other improvements from Bob Moore, Jung-uk Kim, Lv
    Zheng, Yinghai Lu, Tang Chen, Colin Ian King, and Linn Crosetto.

    - ACPI core updates related to hotplug from Toshi Kani, Paul Bolle,
    Yasuaki Ishimatsu, and Rafael J Wysocki.

    - Intel Lynxpoint LPSS (Low-Power Subsystem) support improvements from
    Rafael J Wysocki and Andy Shevchenko.

    * tag 'pm+acpi-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (192 commits)
    cpufreq: Revert incorrect commit 5800043
    cpufreq: MAINTAINERS: Add co-maintainer
    cpuidle: add maintainer entry
    ACPI / thermal: do not always return THERMAL_TREND_RAISING for active trip points
    ARM: s3c64xx: cpuidle: use init/exit common routine
    cpufreq: pxa2xx: initialize variables
    ACPI: video: correct acpi_video_bus_add error processing
    SH: cpuidle: use init/exit common routine
    ARM: S5pv210: compiling issue, ARM_S5PV210_CPUFREQ needs CONFIG_CPU_FREQ_TABLE=y
    ACPI: Fix wrong parameter passed to memblock_reserve
    cpuidle: fix comment format
    pnp: use %*phC to dump small buffers
    isapnp: remove debug leftovers
    ARM: imx: cpuidle: use init/exit common routine
    ARM: davinci: cpuidle: use init/exit common routine
    ARM: kirkwood: cpuidle: use init/exit common routine
    ARM: calxeda: cpuidle: use init/exit common routine
    ARM: tegra: cpuidle: use init/exit common routine for tegra3
    ARM: tegra: cpuidle: use init/exit common routine for tegra2
    ARM: OMAP4: cpuidle: use init/exit common routine
    ...

    Linus Torvalds
     
  • Pull first round of SCSI updates from James "Jej B" Bottomley:
    "The patch set is mostly driver updates (qla4, qla2 [ISF support
    updates], lpfc, aacraid [dual firmware image support]) and a few bug
    fixes"

    * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (47 commits)
    [SCSI] iscsi_tcp: support PF_MEMALLOC/__GFP_MEMALLOC
    [SCSI] libiscsi: avoid unnecessary multiple NULL assignments
    [SCSI] qla4xxx: Update driver version to 5.03.00-k8
    [SCSI] qla4xxx: Added print statements to display AENs
    [SCSI] qla4xxx: Use correct value for max flash node entries
    [SCSI] qla4xxx: Restrict logout from boot target session using session id
    [SCSI] qla4xxx: Use correct flash ddb offset for ISP40XX
    [SCSI] isci: add CONFIG_PM_SLEEP to suspend/resume functions
    [SCSI] scsi_dh_alua: Add module parameter to allow failover to non preferred path without STPG
    [SCSI] qla2xxx: Update the driver version to 8.05.00.03-k.
    [SCSI] qla2xxx: Obtain loopback iteration count from bsg request.
    [SCSI] qla2xxx: Add clarifying printk to thermal access fail cases.
    [SCSI] qla2xxx: Remove duplicated include form qla_isr.c
    [SCSI] qla2xxx: Enhancements to support ISPFx00.
    [SCSI] qla4xxx: Update driver version to 5.03.00-k7
    [SCSI] qla4xxx: Replace dev type macros with generic portal type macros
    [SCSI] scsi_transport_iscsi: Declare portal type string macros for generic use
    [SCSI] qla4xxx: Add flash node mgmt support
    [SCSI] libiscsi: export function iscsi_switch_str_param
    [SCSI] scsi_transport_iscsi: Add flash node mgmt support
    ...

    Linus Torvalds
     
  • Pull media update from Mauro Carvalho Chehab:

    - OF documentation and patches at core and drivers, to be used by for
    embedded media systems

    - some I2C drivers used on go7007 were rewritten/promoted from staging:
    sony-btf-mpx, tw2804, tw9903, tw9906, wis-ov7640, wis-uda1342

    - add fimc-is driver (Exynos)

    - add a new radio driver: radio-si476x

    - add a two new tuners: r820t and tuner_it913x

    - split camera code on em28xx driver and add more models

    - the cypress firmware load is used outside dvb usb drivers. So, move
    it to a common directory to make easier to re-use it

    - siano media driver updated to work with sms2270 devices

    - several work done in order to promote go7007 and solo6x1x out of
    staging (still, there are some pending issues)

    - several API compliance fixes at v4l2 drivers that don't behave as
    expected

    - as usual, lots of driver fixes, improvements, cleanups and new device
    addition at the existing drivers.

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (831 commits)
    [media] cx88: make core less verbose
    [media] em28xx: fix oops at em28xx_dvb_bus_ctrl()
    [media] s5c73m3: fix indentation of the help section in Kconfig
    [media] cx25821-alsa: get rid of a __must_check warning
    [media] cx25821-video: declare cx25821_vidioc_s_std as static
    [media] cx25821-video: remove maxw from cx25821_vidioc_try_fmt_vid_cap
    [media] r820t: Remove a warning for an unused value
    [media] dib0090: Fix a warning at dib0090_set_EFUSE
    [media] dib8000: fix a warning
    [media] dib8000: Fix sub-channel range
    [media] dib8000: store dtv_property_cache in a temp var
    [media] dib8000: warning fix: declare internal functions as static
    [media] r820t: quiet gcc warning on n_ring
    [media] r820t: memory leak in release()
    [media] r820t: precendence bug in r820t_xtal_check()
    [media] videodev2.h: Remove the unused old V4L1 buffer types
    [media] anysee: Grammar s/report the/report to/
    [media] anysee: Initialize ret = 0 in anysee_frontend_attach()
    [media] media: videobuf2: fix the length check for mmap
    [media] em28xx: save isoc endpoint number for DVB only if endpoint has alt settings with xMaxPacketSize != 0
    ...

    Linus Torvalds
     

30 Apr, 2013

11 commits

  • * patchwork: (831 commits)
    [media] cx88: make core less verbose
    [media] em28xx: fix oops at em28xx_dvb_bus_ctrl()
    [media] s5c73m3: fix indentation of the help section in Kconfig
    [media] cx25821-alsa: get rid of a __must_check warning
    [media] cx25821-video: declare cx25821_vidioc_s_std as static
    [media] cx25821-video: remove maxw from cx25821_vidioc_try_fmt_vid_cap
    [media] r820t: Remove a warning for an unused value
    [media] dib0090: Fix a warning at dib0090_set_EFUSE
    [media] dib8000: fix a warning
    [media] dib8000: Fix sub-channel range
    [media] dib8000: store dtv_property_cache in a temp var
    [media] dib8000: warning fix: declare internal functions as static
    [media] r820t: quiet gcc warning on n_ring
    [media] r820t: memory leak in release()
    [media] r820t: precendence bug in r820t_xtal_check()
    [media] videodev2.h: Remove the unused old V4L1 buffer types
    [media] anysee: Grammar s/report the/report to/
    [media] anysee: Initialize ret = 0 in anysee_frontend_attach()
    [media] media: videobuf2: fix the length check for mmap
    [media] em28xx: save isoc endpoint number for DVB only if endpoint has alt settings with xMaxPacketSize != 0
    ...

    Conflicts:
    drivers/media/pci/cx25821/cx25821-video.c
    drivers/media/platform/Kconfig

    Mauro Carvalho Chehab
     
  • Resolve conflicts for Ingo.

    Conflicts:
    drivers/firmware/Kconfig
    drivers/firmware/efivars.c

    Signed-off-by: Matt Fleming

    Matt Fleming
     
  • Merge second batch of fixes from Andrew Morton:

    - various misc bits

    - some printk updates

    - a new "SRAM" driver.

    - MAINTAINERS updates

    - the backlight driver queue

    - checkpatch updates

    - a few init/ changes

    - a huge number of drivers/rtc changes

    - fatfs updates

    - some lib/idr.c work

    - some renaming of the random driver interfaces

    * emailed patches from Andrew Morton : (285 commits)
    net: rename random32 to prandom
    net/core: remove duplicate statements by do-while loop
    net/core: rename random32() to prandom_u32()
    net/netfilter: rename random32() to prandom_u32()
    net/sched: rename random32() to prandom_u32()
    net/sunrpc: rename random32() to prandom_u32()
    scsi: rename random32() to prandom_u32()
    lguest: rename random32() to prandom_u32()
    uwb: rename random32() to prandom_u32()
    video/uvesafb: rename random32() to prandom_u32()
    mmc: rename random32() to prandom_u32()
    drbd: rename random32() to prandom_u32()
    kernel/: rename random32() to prandom_u32()
    mm/: rename random32() to prandom_u32()
    lib/: rename random32() to prandom_u32()
    x86: rename random32() to prandom_u32()
    x86: pageattr-test: remove srandom32 call
    uuid: use prandom_bytes()
    raid6test: use prandom_bytes()
    sctp: convert sctp_assoc_set_id() to use idr_alloc_cyclic()
    ...

    Linus Torvalds
     
  • Signed-off-by: Petko Manolov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Petko Manolov
     
  • Massimo Dal Zotto stopped maintaining the i8k driver several years ago,
    so move his name from MAINTAINERS to CREDITS.

    Signed-off-by: Jean Delvare
    Cc: Massimo Dal Zotto
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jean Delvare
     
  • Create a new N: entry type in MAINTAINERS which performs a regex match
    against filenames; either those extracted from patch +++ or --- lines,
    or those specified on the command-line using the -f option.

    This provides the same benefits as using a K: regex option to match a
    set of filenames (see commit eb90d0855b75 "get_maintainer: allow
    keywords to match filenames"), but without the disadvantage that
    "random" file content, such as comments, will ever match the regex.
    Hence, revert most of that commit.

    Switch the Tegra entry from using K: to N:

    [akpm@linux-foundation.org: fix typo in docs, per Marcin]
    Reported-by: Marcin Slusarz
    Suggested-by: Joe Perches
    Signed-off-by: Stephen Warren
    Acked-by: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stephen Warren
     
  • Pull spi updates from Mark Brown:
    "A fairly quiet release for SPI, mainly driver work. A few highlights:

    - Supports bits per word compatibility checking in the core.
    - Allow use of the IP used in Freescale SPI controllers outside
    Freescale SoCs.
    - DMA support for the Atmel SPI driver.
    - New drivers for the BCM2835 and Tegra114"

    * tag 'spi-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (68 commits)
    spi-topcliff-pch: fix to use list_for_each_entry_safe() when delete list items
    spi-topcliff-pch: missing platform_driver_unregister() on error in pch_spi_init()
    ARM: dts: add pinctrl property for spi node for atmel SoC
    ARM: dts: add spi nodes for the atmel boards
    ARM: dts: add spi nodes for atmel SoC
    ARM: at91: add clocks for spi dt entries
    spi/spi-atmel: add dmaengine support
    spi/spi-atmel: add flag to controller data for lock operations
    spi/spi-atmel: add physical base address
    spi/sirf: fix MODULE_DEVICE_TABLE
    MAINTAINERS: Add git repository and update my address
    spi/s3c64xx: Check for errors in dmaengine prepare_transfer()
    spi/s3c64xx: Fix non-dmaengine usage
    spi: omap2-mcspi: fix error return code in omap2_mcspi_probe()
    spi/s3c64xx: let device core setup the default pin configuration
    MAINTAINERS: Update Grant's email address and maintainership
    spi: omap2-mcspi: Fix transfers if DMADEVICES is not set
    spi: s3c64xx: move to generic dmaengine API
    spi-gpio: init CS before spi_bitbang_setup()
    spi: spi-mpc512x-psc: let transmiter/receiver enabled when in xfer loop
    ...

    Linus Torvalds
     
  • Pull regulator updates from Mark Brown:
    "The diffstat and changelog here is dominated by Lee Jones' heroic
    efforts to sync the ab8500 driver that's been maintained out of tree
    with mainline (plus Axel's cleanup work on the results) but there's a
    few other things here:

    - Axel Lin added regulator_map_voltage_ascend() optimising a common
    pattern for drivers using the core code.
    - Milo Kim tought the regulator core to handle regulators sharing an
    enable GPIO, avoiding the need to do hacks to support such systems.
    - Andrew Bresticker added code to handle missing supplies for
    regulators more sensibly for device tree systems, reducing the need
    for stubbing there.

    plus the usual batch of driver specific updates and fixes"

    * tag 'regulator-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (152 commits)
    regulator: mc13892: Fix MC13892_SWITCHERS0_SWxHI bit in set_voltage_sel
    regulator: Remove NULL test before calling regulator_unregister()
    regulator: mc13783: Add device tree probe support
    regulator: mc13xxx: Add warning of incorrect names of regulators
    regulator: max77686: Don't update max77686->opmode if update register fails
    regulator: max8952: Add missing config.of_node setting for regulator register
    regulator: ab3100: Fix regulator register error handling
    regulator: tps6524x: Use regulator_map_voltage_ascend
    regulator: lp8788-buck: Use regulator_map_voltage_ascend
    regulator: lp872x: Use regulator_map_voltage_ascend
    regulator: mc13892: Use regulator_map_voltage_ascend for mc13892_sw_regulator_ops
    regulator: tps65023: Use regulator_map_voltage_ascend
    regulator: tps65023: Merge tps65020 ldo1 and ldo2 vsel table
    regulator: tps6507x: Use regulator_map_voltage_ascend
    regulator: mc13892: Fix MC13892_SWITCHERS0_SWxHI bit in set_voltage_sel
    regulator: ab3100: device tree support
    regulator: ab3100: refactor probe to use IDs
    regulator: max8973: Don't override control1 variable when set ramp delay bits
    regulator: tps80031: Convert tps80031_dcdc_ops to [get|set]_voltage_sel_regmap
    regulator: tps80031: Fix LDO2 track mode for TPS80031 or TPS80032-ES1.0
    ...

    Linus Torvalds
     
  • Pull staging driver tree update from Greg Kroah-Hartman:
    "Here's the big staging driver tree update for 3.10-rc1

    This update contains loads of comedi driver cleanups and fixes in
    here, iio updates, android driver changes, and other various staging
    driver cleanups.

    Thanks to some drivers being removed, and the comedi driver cleanups,
    we have removed more code than we added:

    627 files changed, 65145 insertions(+), 76321 deletions(-)

    which is always nice to see.

    All of these have been in linux-next for a while."

    * tag 'staging-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (940 commits)
    staging: comedi: ni_labpc: fix legacy driver build
    staging: comedi: das800: cleanup the cio-das802/16 fifo comments
    staging: comedi: das800: rename CamelCase vars in das800_ai_do_cmd()
    staging: comedi: das800: tidy up the private data
    staging: comedi: das800: tidy up das800_interrupt()
    staging: comedi: das800: tidy up das800_ai_insn_read()
    staging: comedi: das800: tidy up das800_di_insn_bits()
    staging: comedi: das800: tidy up das800_do_insn_bits()
    staging: comedi: das800: remove extra divisor calculation call
    staging: comedi: das800: rename {enable,disable}_das800
    staging: comedi: das800: tidy up subdevice init
    staging: comedi: das800: allow attaching without interrupt support
    staging: comedi: das800: interrupts are required for async command support
    staging: comedi: das800: tidy up das800_ai_do_cmdtest()
    staging: comedi: das800: remove 'volatile' on private data variables
    staging: comedi: das800: cleanup the boardinfo
    staging: comedi: das800: cleanup range table declarations
    staging: comedi: das800: introduce das800_ind_{write, read}()
    staging: comedi: das800: remove forward declarations
    staging: comedi: das800: move das800_set_frequency()
    ...

    Linus Torvalds
     
  • Pull char/misc driver update from Greg Kroah-Hartman:
    "Here's the big char / misc driver update for 3.10-rc1

    A number of various driver updates, the majority being new
    functionality in the MEI driver subsystem (it's now a subsystem, it
    started out just a single driver), extcon updates, memory updates,
    hyper-v updates, and a bunch of other small stuff that doesn't fit in
    any other tree.

    All of these have been in linux-next for a while"

    * tag 'char-misc-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (148 commits)
    Tools: hv: Fix a checkpatch warning
    tools: hv: skip iso9660 mounts in hv_vss_daemon
    tools: hv: use FIFREEZE/FITHAW in hv_vss_daemon
    tools: hv: use getmntent in hv_vss_daemon
    Tools: hv: Fix a checkpatch warning
    tools: hv: fix checks for origin of netlink message in hv_vss_daemon
    Tools: hv: fix warnings in hv_vss_daemon
    misc: mark spear13xx-pcie-gadget as broken
    mei: fix krealloc() misuse in in mei_cl_irq_read_msg()
    mei: reduce flow control only for completed messages
    mei: reseting -> resetting
    mei: fix reading large reposnes
    mei: revamp mei_irq_read_client_message function
    mei: revamp mei_amthif_irq_read_message
    mei: revamp hbm state machine
    Revert "drivers/scsi: use module_pcmcia_driver() in pcmcia drivers"
    Revert "scsi: pcmcia: nsp_cs: remove module init/exit function prototypes"
    scsi: pcmcia: nsp_cs: remove module init/exit function prototypes
    mei: wd: fix line over 80 characters
    misc: tsl2550: Use dev_pm_ops
    ...

    Linus Torvalds
     
  • Pull hwmon update from Guenter Roeck:

    - New drivers for NCT6775, NCT6776, NCT6779, and LM95234.

    - Added support for LTC2974, LTC3883, LM25056, TMP431, TMP432, ADT7310,
    and ADT7320 to existing drivers.

    - Various code cleanups and minor improvements.

    * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (54 commits)
    hwmon: (nct6775) Fix coding style problems
    hwmon: (nct6775) Constify strings
    hwmon: (tmp401) Add support for TMP432
    hwmon: (tmp401) Add support for update_interval attribute
    hwmon: (tmp401) Reset valid flag when resetting temperature history
    hwmon: (tmp401) Simplification and cleanup
    hwmon: (tmp401) Use sysfs_create_group / sysfs_remove_group
    hwmon: (tmp401) Drop unused defines, use BIT for bit masks
    hwmon: (nct6775) Use ARRAY_SIZE for loops where possible
    documentation: hwmon: Fix typo in documentation/hwmon
    hwmon: (nct6775) Enable both AUXTIN and VIN3 on NCT6776
    hwmon: (ad7314) use spi_get_drvdata() and spi_set_drvdata()
    MAINTAINERS: Add myself as maintainer for the NCT6775 driver
    hwmon: (nct6775) Expand scope of supported chips
    hwmon: (gpio-fan) Use is_visible to determine if attributes should be created
    hwmon: (tmp401) Fix device detection for TMP411B and TMP411C
    hwmon: Add driver for LM95234
    hwmon: (tmp401) Add support for TMP431
    hwmon: (pmbus/lm25066) Add support for LM25056
    hwmon: (pmbus/lm25066) Refactor device specific coefficients
    ...

    Linus Torvalds
     

28 Apr, 2013

2 commits

  • * pm-cpufreq: (57 commits)
    cpufreq: MAINTAINERS: Add co-maintainer
    cpufreq: pxa2xx: initialize variables
    ARM: S5pv210: compiling issue, ARM_S5PV210_CPUFREQ needs CONFIG_CPU_FREQ_TABLE=y
    cpufreq: cpu0: Put cpu parent node after using it
    cpufreq: ARM big LITTLE: Adapt to latest cpufreq updates
    cpufreq: ARM big LITTLE: put DT nodes after using them
    cpufreq: Don't call __cpufreq_governor() for drivers without target()
    cpufreq: exynos5440: Protect OPP search calls with RCU lock
    cpufreq: dbx500: Round to closest available freq
    cpufreq: Call __cpufreq_governor() with correct policy->cpus mask
    cpufreq / intel_pstate: Optimize intel_pstate_set_policy
    cpufreq: OMAP: instantiate omap-cpufreq as a platform_driver
    arm: exynos: Enable OPP library support for exynos5440
    cpufreq: exynos: Remove error return even if no soc is found
    cpufreq: exynos: Add cpufreq driver for exynos5440
    cpufreq: AMD "frequency sensitivity feedback" powersave bias for ondemand governor
    cpufreq: ondemand: allow custom powersave_bias_target handler to be registered
    cpufreq: convert cpufreq_driver to using RCU
    cpufreq: powerpc/platforms/cell: move cpufreq driver to drivers/cpufreq
    cpufreq: sparc: move cpufreq driver to drivers/cpufreq
    ...

    Conflicts:
    MAINTAINERS (with commit a8e39c3 from pm-cpuidle)
    drivers/cpufreq/cpufreq_governor.h (with commit beb0ff3)

    Rafael J. Wysocki
     
  • * pm-cpuidle: (51 commits)
    cpuidle: add maintainer entry
    ARM: s3c64xx: cpuidle: use init/exit common routine
    SH: cpuidle: use init/exit common routine
    cpuidle: fix comment format
    ARM: imx: cpuidle: use init/exit common routine
    ARM: davinci: cpuidle: use init/exit common routine
    ARM: kirkwood: cpuidle: use init/exit common routine
    ARM: calxeda: cpuidle: use init/exit common routine
    ARM: tegra: cpuidle: use init/exit common routine for tegra3
    ARM: tegra: cpuidle: use init/exit common routine for tegra2
    ARM: OMAP4: cpuidle: use init/exit common routine
    ARM: shmobile: cpuidle: use init/exit common routine
    ARM: tegra: cpuidle: use init/exit common routine
    ARM: OMAP3: cpuidle: use init/exit common routine
    ARM: at91: cpuidle: use init/exit common routine
    ARM: ux500: cpuidle: use init/exit common routine
    cpuidle: make a single register function for all
    ARM: ux500: cpuidle: replace for_each_online_cpu by for_each_possible_cpu
    cpuidle: remove en_core_tk_irqen flag
    ARM: OMAP3: remove cpuidle_wrap_enter
    ...

    Rafael J. Wysocki
     

27 Apr, 2013

2 commits

  • Add Viresh as a co-maintainer of cpufreq framework.

    This would mostly be for cpufreq core and ARM drivers but not
    restricted to them.

    Also add a pointer to the git tree cpufreq patches are pulled into.

    [rjw: Changelog]
    Signed-off-by: Viresh Kumar
    Tentatively-acked-by: Kevin Hilman
    Signed-off-by: Rafael J. Wysocki

    viresh kumar
     
  • Currently cpuidle drivers are spread across different archs.

    As a result, there are several different paths for cpuidle patch
    submissions: cpuidle core changes go through linux-pm, ARM driver
    changes go to the arm-soc or SoC-specific trees, sh changes go
    through the sh arch tree, pseries changes go through the PowerPC tree
    and finally intel changes go through the Len's tree while ACPI idle
    changes go through linux-pm.

    That makes it difficult to consolidate code and to propagate
    modifications from the cpuidle core to the different drivers.

    Hopefully, a movement has started to put the majority of cpuidle
    drivers under drivers/cpuidle like cpuidle-calxeda.c and
    cpuidle-kirkwood.c.

    Add a maintainer entry for cpuidle to MAINTAINERS to clarify the
    situation and to indicate to new cpuidle driver authors that those
    drivers should not go into arch-specific directories.

    The upstreaming process is unchanged: Rafael takes patches for
    merging into his tree, but with an Acked-by: tag from the driver's
    maintainer, so indicate in the drivers' headers who maintains them.

    The arrangement will be the same as for cpufreq.

    [rjw: Changelog]
    Signed-off-by: Daniel Lezcano
    Acked-by: Linus Walleij
    Acked-by: Andrew Lunn #for kirkwood
    Acked-by: Jason Cooper #for kirkwood
    Acked-by: Kevin Hilman
    Signed-off-by: Rafael J. Wysocki

    Daniel Lezcano
     

24 Apr, 2013

2 commits