Eric Lee / smarc-fsl-linux-kernel

30 Apr, 2013

3 commits

  • fdc719b63   Merge tag 'staging-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging ... Browse Code »

    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
     
  • 4f567cbc9   Merge tag 'char-misc-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc ... Browse Code »

    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
     
  • 92ddcf4a0   Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging ... Browse Code »

    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
     

15 Apr, 2013

2 commits

12 Apr, 2013

3 commits

  • 6074fffbf   Merge tag 'sound-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound ... Browse Code »

    Pull sound fixes from Takashi Iwai:
    "This contains a few small ASoC fixes (wm8903, wm5102, samsung-i2s,
    tegra, and soc-compress) and an endian fix for NI USB-audio devices,
    update for Mark's e-mail address.

    No scary changes, AFAIS."

    * tag 'sound-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    MAINTAINERS: Update e-mail address
    ASoC: wm5102: Correct lookup of arizona struct in SYSCLK event
    ASoC: wm8903: Fix the bypass to HP/LINEOUT when no DAC or ADC is running
    ALSA: usb-audio: fix endianness bug in snd_nativeinstruments_*
    ASoC: tegra: Don't claim to support PCM pause and resume
    ASoC: Samsung: set drvdata before adding secondary device
    ASoC: Samsung: return error if drvdata is not set
    ASoC: compress: Cancel delayed power down if needed
    ASoC: core: Fix to check return value of snd_soc_update_bits_locked()

    Linus Torvalds
     
  • b02e48f2f   MAINTAINERS: Update e-mail address ... Browse Code »

    Update the e-mail address I use for subsystems.

    Signed-off-by: Mark Brown

    Mark Brown
     
  • ce6fbaf16   Merge tag 'arm-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull ARM SoC bug fixes from Arnd Bergmann:
    "A little later during the week than the last few pull requests, since
    there was very little that came in before 3.9-rc6. At least things
    have calmed down again here.

    Some important bug fixes that came in over the last 10 days, mostly
    mvebu and imx:

    - Multiple regressions on i.mx following the conversion of the clock
    code, hopefully the last we are seeing of those.
    - a regression in the mvebu irq handling code
    - An incorrect register offset in the rewritten s3c24xx irq code.
    - Two bugs in setting up the iomega_ix2_200 machine
    - Turning on an extra bus clock on imx
    - A MAINTAINERS file entry for Roland Stigge"

    * tag 'arm-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    arm: mvebu: Fix the irq map function in SMP mode
    Fix GE0/GE1 init on ix2-200 as GE0 has no PHY
    ARM: S3C24XX: Fix interrupt pending register offset of the EINT controller
    ARM: S3C24XX: Correct NR_IRQS definition for s3c2440
    ARM i.MX6: Fix ldb_di clock selection
    ARM: imx: provide twd clock lookup from device tree
    ARM: imx35 Bugfix admux clock
    ARM: clk-imx35: Bugfix iomux clock
    ARM: mxs: Slow down the I2C clock speed
    MAINTAINERS: Add maintainer for LPC32xx
    ARM: Kirkwood: Fix typo in the definition of ix2-200 rebuild LED

    Linus Torvalds
     

09 Apr, 2013

1 commit

  • 0a01216c4   Merge tag 'imx-fixes-3.9-5' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes ... Browse Code »

    From Shawn Guo :

    The imx fixes for 3.9, take 5:

    * A couple imx35 clock fixes for regressions caused by common clock
    framework conversion. The admux and iomux get disabled by common
    clock framework late initcall, and hence causes problems.
    * Add missing twd clock lookup in device tree. This becomes required
    since commit bd60345 (ARM: use device tree to get smp_twd clock)
    forces all DT boot to find lookup from device tree.
    * Fix imx6q ldb_di clock parents mismatch per reference manual.

    * tag 'imx-fixes-3.9-5' of git://git.linaro.org/people/shawnguo/linux-2.6: (217 commits)
    ARM i.MX6: Fix ldb_di clock selection
    ARM: imx: provide twd clock lookup from device tree
    ARM: imx35 Bugfix admux clock
    ARM: clk-imx35: Bugfix iomux clock

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

08 Apr, 2013

3 commits

03 Apr, 2013

1 commit

02 Apr, 2013

2 commits

01 Apr, 2013

2 commits

  • ff3421dee   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Browse Code »

    Pull networking fixes from David Miller:

    1) sadb_msg prepared for IPSEC userspace forgets to initialize the
    satype field, fix from Nicolas Dichtel.

    2) Fix mac80211 synchronization during station removal, from Johannes
    Berg.

    3) Fix IPSEC sequence number notifications when they wrap, from Steffen
    Klassert.

    4) Fix cfg80211 wdev tracing crashes when add_virtual_intf() returns an
    error pointer, from Johannes Berg.

    5) In mac80211, don't call into the channel context code with the
    interface list mutex held. From Johannes Berg.

    6) In mac80211, if we don't actually associate, do not restart the STA
    timer, otherwise we can crash. From Ben Greear.

    7) Missing dma_mapping_error() check in e1000, ixgb, and e1000e. From
    Christoph Paasch.

    8) Fix sja1000 driver defines to not conflict with SH port, from Marc
    Kleine-Budde.

    9) Don't call il4965_rs_use_green with a NULL station, from Colin Ian
    King.

    10) Suspend/Resume in the FEC driver fail because the buffer descriptors
    are not initialized at all the moments in which they should. Fix
    from Frank Li.

    11) cpsw and davinci_emac drivers both use the wrong interface to
    restart a stopped TX queue. Use netif_wake_queue not
    netif_start_queue, the latter is for initialization/bringup not
    active management of the queue. From Mugunthan V N.

    12) Fix regression in rate calculations done by
    psched_ratecfg_precompute(), missing u64 type promotion. From
    Sergey Popovich.

    13) Fix length overflow in tg3 VPD parsing, from Kees Cook.

    14) AOE driver fails to allocate enough headroom, resulting in crashes.
    Fix from Eric Dumazet.

    15) RX overflow happens too quickly in sky2 driver because pause packet
    thresholds are not programmed correctly. From Mirko Lindner.

    16) Bonding driver manages arp_interval and miimon settings incorrectly,
    disabling one unintentionally disables both. Fix from Nikolay
    Aleksandrov.

    17) smsc75xx drivers don't program the RX mac properly for jumbo frames.
    Fix from Steve Glendinning.

    18) Fix off-by-one in Codel packet scheduler. From Vijay Subramanian.

    19) Fix packet corruption in atl1c by disabling MSI support, from Hannes
    Frederic Sowa.

    20) netdev_rx_handler_unregister() needs a synchronize_net() to fix
    crashes in bonding driver unload stress tests. From Eric Dumazet.

    21) rxlen field of ks8851 RX packet descriptors not interpreted
    correctly (it is 12 bits not 16 bits, so needs to be masked after
    shifting the 32-bit value down 16 bits). Fix from Max Nekludov.

    22) Fix missed RX/TX enable in sh_eth driver due to mishandling of link
    change indications. From Sergei Shtylyov.

    23) Fix crashes during spurious ECI interrupts in sh_eth driver, also
    from Sergei Shtylyov.

    24) dm9000 driver initialization is done wrong for revision B devices
    with DSP PHY, from Joseph CHANG.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (53 commits)
    DM9000B: driver initialization upgrade
    sh_eth: make 'link' field of 'struct sh_eth_private' *int*
    sh_eth: workaround for spurious ECI interrupt
    sh_eth: fix handling of no LINK signal
    ks8851: Fix interpretation of rxlen field.
    net: add a synchronize_net() in netdev_rx_handler_unregister()
    MAINTAINERS: Update netxen_nic maintainers list
    atl1e: drop pci-msi support because of packet corruption
    net: fq_codel: Fix off-by-one error
    net: calxedaxgmac: Wake-on-LAN fixes
    net: calxedaxgmac: fix rx ring handling when OOM
    net: core: Remove redundant call to 'nf_reset' in 'dev_forward_skb'
    smsc75xx: fix jumbo frame support
    net: fix the use of this_cpu_ptr
    bonding: fix disabling of arp_interval and miimon
    ipv6: don't accept node local multicast traffic from the wire
    sky2: Threshold for Pause Packet is set wrong
    sky2: Receive Overflows not counted
    aoe: reserve enough headroom on skbs
    line up comment for ndo_bridge_getlink
    ...

    Linus Torvalds
     
  • d299c2903   Merge tag 'for-linus-20130331' of git://git.kernel.dk/linux-block ... Browse Code »

    Pull block fixes from Jens Axboe:
    "Alright, this time from 10K up in the air.

    Collection of fixes that have been queued up since the merge window
    opened, hence postponed until later in the cycle. The pull request
    contains:

    - A bunch of fixes for the xen blk front/back driver.

    - A round of fixes for the new IBM RamSan driver, fixing various
    nasty issues.

    - Fixes for multiple drives from Wei Yongjun, bad handling of return
    values and wrong pointer math.

    - A fix for loop properly killing partitions when being detached."

    * tag 'for-linus-20130331' of git://git.kernel.dk/linux-block: (25 commits)
    mg_disk: fix error return code in mg_probe()
    rsxx: remove unused variable
    rsxx: enable error return of rsxx_eeh_save_issued_dmas()
    block: removes dynamic allocation on stack
    Block: blk-flush: Fixed indent code style
    cciss: fix invalid use of sizeof in cciss_find_cfgtables()
    loop: cleanup partitions when detaching loop device
    loop: fix error return code in loop_add()
    mtip32xx: fix error return code in mtip_pci_probe()
    xen-blkfront: remove frame list from blk_shadow
    xen-blkfront: pre-allocate pages for requests
    xen-blkback: don't store dev_bus_addr
    xen-blkfront: switch from llist to list
    xen-blkback: fix foreach_grant_safe to handle empty lists
    xen-blkfront: replace kmalloc and then memcpy with kmemdup
    xen-blkback: fix dispatch_rw_block_io() error path
    rsxx: fix missing unlock on error return in rsxx_eeh_remap_dmas()
    Adding in EEH support to the IBM FlashSystem 70/80 device driver
    block: IBM RamSan 70/80 error message bug fix.
    block: IBM RamSan 70/80 branding changes.
    ...

    Linus Torvalds
     

30 Mar, 2013

3 commits

  • 46a1f21a6   PNP: List Rafael Wysocki as a maintainer ... Browse Code »

    The Adam Belay's e-mail address in MAINTAINERS under PNP SUPPORT
    is not valid any more and I started to maintain that code in the
    meantime as a matter of fact, so list myself as a maintainer of it
    along with Bjorn and remove the Adam's entry from it.

    Signed-off-by: Rafael J. Wysocki
    Signed-off-by: Linus Torvalds

    Rafael J. Wysocki
     
  • 8622315e0   MAINTAINERS: Update netxen_nic maintainers list ... Browse Code »

    o Add myself to netxen_nic maintainers list

    Signed-off-by: Manish Chopra
    Signed-off-by: David S. Miller

    Manish Chopra
     
  • 67e17c110   Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc ... Browse Code »

    Pull arc architecture fixes from Vineet Gupta:
    "This includes fix for a serious bug in DMA mapping API, make
    allyesconfig wreckage, removal of bogus email-list placeholder in
    MAINTAINERS, a typo in ptrace helper code and last remaining changes
    for syscall ABI v3 which we are finally starting to transition-to
    internally.

    The request is late than I intended to - but I was held up with
    debugging a timer link list corruption, for which a proposed fix to
    generic timer code was sent out to lkml/tglx earlier today."

    * 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
    ARC: Fix the typo in event identifier flags used by ptrace
    arc: fix dma_address assignment during dma_map_sg()
    ARC: Remove SET_PERSONALITY (tracks cross-arch change)
    ARC: ABIv3: fork/vfork wrappers not needed in "no-legacy-syscall" ABI
    ARC: ABIv3: Print the correct ABI ver
    ARC: make allyesconfig build breakages
    ARC: MAINTAINERS update for ARC

    Linus Torvalds
     

29 Mar, 2013

1 commit

27 Mar, 2013

2 commits

26 Mar, 2013

2 commits

  • cd9a8fb5a   MAINTAINERS: add ssbi ... Browse Code »

    The ssbi device is specific to the Qualcomm MSM SoCs.

    Signed-off-by: David Brown
    Signed-off-by: Greg Kroah-Hartman

    David Brown
     
  • fb9bb1829   Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull ARM SoC bug fixes from Arnd Bergmann:
    "Four patches for arm-soc this week:

    - Kevin Hilman is no longer reachable under his previous email
    address. He submitted the patch earlier, but nobody felt
    responsible to pick it up.

    - One Tegra fix for an incorect register address in device tree.

    - IMX multiplatform support exposes a configuration option that leads
    to unbootable kernels on all other machines and that needs to
    depend on that platform.

    - A nontrivial bug fix for the setup of the mxs video output."

    * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    MAINTAINERS: update email address for Kevin Hilman
    ARM: tegra: fix register address of slink controller
    ARM: imx: add dependency check for DEBUG_IMX_UART_PORT
    ARM: video: mxs: Fix mxsfb misconfiguring VDCTRL0

    Linus Torvalds
     

24 Mar, 2013

1 commit

  • df2a8f39c   Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux ... Browse Code »

    Pull i2c fixes from Wolfram Sang:
    "One bugfix for the tegra driver. Two updates regarding email
    addresses and MAINTAINERS which I like to have up-to-date so people
    can be reached immediately. While we are here, there is on PCI_ID
    addition."

    * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
    MAINTAINERS: add maintainer entry for atmel i2c driver
    i2c: Fix my e-mail address in drivers and documentation
    i2c: iSMT: add Intel Avoton DeviceIDs
    i2c: tegra: check the clk_prepare_enable() return value

    Linus Torvalds
     

23 Mar, 2013

2 commits

  • 5da273fe3   Merge git://git.infradead.org/users/willy/linux-nvme ... Browse Code »

    Pull NVMe driver update from Matthew Wilcox:
    "These patches have mostly been baking for a few months; sorry I didn't
    get them in during the merge window. They're all bug fixes, except
    for the addition of the SMART log and the addition to MAINTAINERS."

    * git://git.infradead.org/users/willy/linux-nvme:
    NVMe: Add namespaces with no LBA range feature
    MAINTAINERS: Add entry for the NVMe driver
    NVMe: Initialize iod nents to 0
    NVMe: Define SMART log
    NVMe: Add result to nvme_get_features
    NVMe: Set result from user admin command
    NVMe: End queued bio requests when freeing queue
    NVMe: Free cmdid on nvme_submit_bio error

    Linus Torvalds
     
  • c69d72aec   MAINTAINERS: update email address for Kevin Hilman ... Browse Code »

    Signed-off-by: Kevin Hilman
    Signed-off-by: Arnd Bergmann

    Kevin Hilman
     

22 Mar, 2013

1 commit

21 Mar, 2013

1 commit

  • b56fb7087   Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next ... Browse Code »

    Daniel writes:
    Bunch of fixes, all pretty high-priority
    - Fix execbuf argument checking (Kees Cook)
    - Optionally obfuscate kernel addresses in dumps (Kees Cook)
    - Two patches from Takashi Iwai to fix DP link training regressions he's
    seen.
    - intel-gfx is no longer subscribers-only (well, just no longer moderated
    in an annoying way for non-subscribers), update MAINTAINERS
    - gm45 gmbus irq fallout fix (Jiri Kosina)

    * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
    drm/i915: stop using GMBUS IRQs on Gen4 chips
    MAINTAINERS: intel-gfx is no longer subscribers-only
    drm/i915: Use the fixed pixel clock for eDP in intel_dp_set_m_n()
    Revert "drm/i915: try to train DP even harder"
    drm/i915: bounds check execbuffer relocation count
    drm/i915: restrict kernel address leak in debugfs

    Dave Airlie
     

19 Mar, 2013

2 commits

  • 94877548e   MAINTAINERS: Remove Mark M. Hoffman ... Browse Code »

    Mark M. Hoffman stopped working on the Linux kernel several years
    ago, so he should no longer be listed as a driver maintainer. I'm not
    even sure if his e-mail address still works.

    I can take over 3 drivers he was responsible for, the 4th one will
    fall down to the subsystem maintainer.

    Also give Mark credit for all the good work he did.

    Signed-off-by: Jean Delvare
    Cc: "Mark M. Hoffman"
    Acked-by: Guenter Roeck
    Cc: Wolfram Sang

    Jean Delvare
     
  • c45bb8cb7   Merge 3.9-rc3 into staging-next ... Browse Code »

    This resolves the merge error due to removing the ccg staging driver,
    and picks up the other staging driver fixes that went into 3.9-rc3.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

18 Mar, 2013

1 commit

16 Mar, 2013

2 commits

13 Mar, 2013

1 commit

12 Mar, 2013

2 commits

09 Mar, 2013

1 commit

08 Mar, 2013

1 commit