17 Sep, 2013

2 commits

  • Pull timer code update from Thomas Gleixner:
    - armada SoC clocksource overhaul with a trivial merge conflict
    - Minor improvements to various SoC clocksource drivers

    * 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    clocksource: armada-370-xp: Add detailed clock requirements in devicetree binding
    clocksource: armada-370-xp: Get reference fixed-clock by name
    clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
    clocksource: armada-370-xp: Fix device-tree binding
    clocksource: armada-370-xp: Introduce new compatibles
    clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE
    clocksource: armada-370-xp: Simplify TIMER_CTRL register access
    clocksource: armada-370-xp: Use BIT()
    ARM: timer-sp: Set dynamic irq affinity
    ARM: nomadik: add dynamic irq flag to the timer
    clocksource: sh_cmt: 32-bit control register support
    clocksource: em_sti: Convert to devm_* managed helpers

    Linus Torvalds
     
  • Pull CIFS fixes from Steve French:
    "Two minor cifs fixes and a minor documentation cleanup for cifs.txt"

    * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
    cifs: update cifs.txt and remove some outdated infos
    cifs: Avoid calling unlock_page() twice in cifs_readpage() when using fscache
    cifs: Do not take a reference to the page in cifs_readpage_worker()

    Linus Torvalds
     

16 Sep, 2013

1 commit

  • Pull misc SCSI driver updates from James Bottomley:
    "This patch set is a set of driver updates (megaraid_sas, fnic, lpfc,
    ufs, hpsa) we also have a couple of bug fixes (sd out of bounds and
    ibmvfc error handling) and the first round of esas2r checker fixes and
    finally the much anticipated big endian additions for megaraid_sas"

    * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (47 commits)
    [SCSI] fnic: fnic Driver Tuneables Exposed through CLI
    [SCSI] fnic: Kernel panic while running sh/nosh with max lun cfg
    [SCSI] fnic: Hitting BUG_ON(io_req->abts_done) in fnic_rport_exch_reset
    [SCSI] fnic: Remove QUEUE_FULL handling code
    [SCSI] fnic: On system with >1.1TB RAM, VIC fails multipath after boot up
    [SCSI] fnic: FC stat param seconds_since_last_reset not getting updated
    [SCSI] sd: Fix potential out-of-bounds access
    [SCSI] lpfc 8.3.42: Update lpfc version to driver version 8.3.42
    [SCSI] lpfc 8.3.42: Fixed issue of task management commands having a fixed timeout
    [SCSI] lpfc 8.3.42: Fixed inconsistent spin lock usage.
    [SCSI] lpfc 8.3.42: Fix driver's abort loop functionality to skip IOs already getting aborted
    [SCSI] lpfc 8.3.42: Fixed failure to allocate SCSI buffer on PPC64 platform for SLI4 devices
    [SCSI] lpfc 8.3.42: Fix WARN_ON when driver unloads
    [SCSI] lpfc 8.3.42: Avoided making pci bar ioremap call during dual-chute WQ/RQ pci bar selection
    [SCSI] lpfc 8.3.42: Fixed driver iocbq structure's iocb_flag field running out of space
    [SCSI] lpfc 8.3.42: Fix crash on driver load due to cpu affinity logic
    [SCSI] lpfc 8.3.42: Fixed logging format of setting driver sysfs attributes hard to interpret
    [SCSI] lpfc 8.3.42: Fixed back to back RSCNs discovery failure.
    [SCSI] lpfc 8.3.42: Fixed race condition between BSG I/O dispatch and timeout handling
    [SCSI] lpfc 8.3.42: Fixed function mode field defined too small for not recognizing dual-chute mode
    ...

    Linus Torvalds
     

14 Sep, 2013

1 commit


13 Sep, 2013

5 commits

  • Pull MIPS updates from Ralf Baechle:
    "This has been sitting in -next for a while with no objections and all
    MIPS defconfigs except one are building fine; that one platform got
    broken by another patch in your tree and I'm going to submit a patch
    separately.

    - a handful of fixes that didn't make 3.11
    - a few bits of Octeon 3 support with more to come for a later
    release
    - platform enhancements for Octeon, ath79, Lantiq, Netlogic and
    Ralink SOCs
    - a GPIO driver for the Octeon
    - some dusting off of the DECstation code
    - the usual dose of cleanups"

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (65 commits)
    MIPS: DMA: Fix BUG due to smp_processor_id() in preemptible code
    MIPS: kexec: Fix random crashes while loading crashkernel
    MIPS: kdump: Skip walking indirection page for crashkernels
    MIPS: DECstation HRT calibration bug fixes
    MIPS: Export copy_from_user_page() (needed by lustre)
    MIPS: Add driver for the built-in PCI controller of the RT3883 SoC
    MIPS: DMA: For BMIPS5000 cores flush region just like non-coherent R10000
    MIPS: ralink: Add support for reset-controller API
    MIPS: ralink: mt7620: Add cpu-feature-override header
    MIPS: ralink: mt7620: Add spi clock definition
    MIPS: ralink: mt7620: Add wdt clock definition
    MIPS: ralink: mt7620: Improve clock frequency detection
    MIPS: ralink: mt7620: This SoC has EHCI and OHCI hosts
    MIPS: ralink: mt7620: Add verbose ram info
    MIPS: ralink: Probe clocksources from OF
    MIPS: ralink: Add support for systick timer found on newer ralink SoC
    MIPS: ralink: Add support for periodic timer irq
    MIPS: Netlogic: Built-in DTB for XLP2xx SoC boards
    MIPS: Netlogic: Add support for USB on XLP2xx
    MIPS: Netlogic: XLP2xx update for I2C controller
    ...

    Linus Torvalds
     
  • Merge more patches from Andrew Morton:
    "The rest of MM. Plus one misc cleanup"

    * emailed patches from Andrew Morton : (35 commits)
    mm/Kconfig: add MMU dependency for MIGRATION.
    kernel: replace strict_strto*() with kstrto*()
    mm, thp: count thp_fault_fallback anytime thp fault fails
    thp: consolidate code between handle_mm_fault() and do_huge_pmd_anonymous_page()
    thp: do_huge_pmd_anonymous_page() cleanup
    thp: move maybe_pmd_mkwrite() out of mk_huge_pmd()
    mm: cleanup add_to_page_cache_locked()
    thp: account anon transparent huge pages into NR_ANON_PAGES
    truncate: drop 'oldsize' truncate_pagecache() parameter
    mm: make lru_add_drain_all() selective
    memcg: document cgroup dirty/writeback memory statistics
    memcg: add per cgroup writeback pages accounting
    memcg: check for proper lock held in mem_cgroup_update_page_stat
    memcg: remove MEMCG_NR_FILE_MAPPED
    memcg: reduce function dereference
    memcg: avoid overflow caused by PAGE_ALIGN
    memcg: rename RESOURCE_MAX to RES_COUNTER_MAX
    memcg: correct RESOURCE_MAX to ULLONG_MAX
    mm: memcg: do not trap chargers with full callstack on OOM
    mm: memcg: rework and document OOM waiting and wakeup
    ...

    Linus Torvalds
     
  • Signed-off-by: Sha Zhengju
    Cc: Fengguang Wu
    Cc: Greg Thelen
    Cc: KAMEZAWA Hiroyuki
    Cc: Michal Hocko
    Cc: Johannes Weiner
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Sha Zhengju
     
  • Pull vfs pile 4 from Al Viro:
    "list_lru pile, mostly"

    This came out of Andrew's pile, Al ended up doing the merge work so that
    Andrew didn't have to.

    Additionally, a few fixes.

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (42 commits)
    super: fix for destroy lrus
    list_lru: dynamically adjust node arrays
    shrinker: Kill old ->shrink API.
    shrinker: convert remaining shrinkers to count/scan API
    staging/lustre/libcfs: cleanup linux-mem.h
    staging/lustre/ptlrpc: convert to new shrinker API
    staging/lustre/obdclass: convert lu_object shrinker to count/scan API
    staging/lustre/ldlm: convert to shrinkers to count/scan API
    hugepage: convert huge zero page shrinker to new shrinker API
    i915: bail out earlier when shrinker cannot acquire mutex
    drivers: convert shrinkers to new count/scan API
    fs: convert fs shrinkers to new scan/count API
    xfs: fix dquot isolation hang
    xfs-convert-dquot-cache-lru-to-list_lru-fix
    xfs: convert dquot cache lru to list_lru
    xfs: rework buffer dispose list tracking
    xfs-convert-buftarg-lru-to-generic-code-fix
    xfs: convert buftarg LRU to generic code
    fs: convert inode and dentry shrinking to be node aware
    vmscan: per-node deferred work
    ...

    Linus Torvalds
     
  • Pull led updates from Bryan Wu:
    "Sorry for the late pull request, since I'm just back from vacation.

    LED subsystem updates for 3.12:
    - pca9633 driver DT supporting and pca9634 chip supporting
    - restore legacy device attributes for lp5521
    - other fixing and updates"

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (28 commits)
    leds: wm831x-status: Request a REG resource
    leds: trigger: ledtrig-backlight: Fix invalid memory access in fb_event notification callback
    leds-pca963x: Fix device tree parsing
    leds-pca9633: Rename to leds-pca963x
    leds-pca9633: Add mutex to the ledout register
    leds-pca9633: Unique naming of the LEDs
    leds-pca9633: Add support for PCA9634
    leds: lp5562: use LP55xx common macros for device attributes
    Documentation: leds-lp5521,lp5523: update device attribute information
    leds: lp5523: remove unnecessary writing commands
    leds: lp5523: restore legacy device attributes
    leds: lp5523: LED MUX configuration on initializing
    leds: lp5523: make separate API for loading engine
    leds: lp5521: remove unnecessary writing commands
    leds: lp5521: restore legacy device attributes
    leds: lp55xx: add common macros for device attributes
    leds: lp55xx: add common data structure for program
    Documentation: leds: Fix a typo
    leds: ss4200: Fix incorrect placement of __initdata
    leds: clevo-mail: Fix incorrect placement of __initdata
    ...

    Linus Torvalds
     

12 Sep, 2013

17 commits

  • Pull sound fixes from Takashi Iwai:
    "A few last-minute fixes for 3.12-rc1. All patches are driver
    specific.

    - HD-audio fixes: MacBook 6,1/6,2 speaker fix, ASUS TX300 dock
    speaker fix, Toshiba Satellite irq fix, Haswell HDMI audio
    cleanups)

    - ASoC fixes: atmel irq fix, fsl DT fix, mc13783 spi fix, kirkwood
    compatible string change, etc"

    * tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ASoC: mc13783: add spi errata fix
    ASoC: rsnd: fixup flag name of rsnd_scu_platform_info
    ALSA: hda - Add CS4208 codec support for MacBook 6,1 and 6,2
    ALSA: hda - Add Toshiba Satellite C870 to MSI blacklist
    ASoC: fsl_spdif: Select regmap-mmio
    ALSA: hda - unmute pin amplifier in infoframe setup for Haswell
    ALSA: hda - define is_haswell() to check if a display audio codec is Haswell
    ALSA: hda - Add dock speaker support for ASUS TX300
    ASoC: kirkwood: change the compatible string of the kirkwood-i2s driver
    ASoC: atmel: disable error interrupt
    ASoC: fsl: imx-audmux: Do not call imx_audmux_parse_dt_defaults() on non-dt kernel

    Linus Torvalds
     
  • Pull thermal management updates from Zhang Rui:
    "We have a lot of SOC changes and a few thermal core fixes this time.

    The biggest change is about exynos thermal driver restructure. The
    patch set adds TMU (Thermal management Unit) driver support for
    exynos5440 platform. There are 3 instances of the TMU controllers so
    necessary cleanup/re-structure is done to handle multiple thermal
    zone.

    The next biggest change is the introduction of the imx thermal driver.
    It adds the imx thermal support using Temperature Monitor (TEMPMON)
    block found on some Freescale i.MX SoCs. The driver uses syscon
    regmap interface to access TEMPMON control registers and calibration
    data, and supports cpufreq as the cooling device.

    Highlights:

    - restructure exynos thermal driver.

    - introduce new imx thermal driver.

    - fix a bug in thermal core, which powers on the fans unexpectedly
    after resume from suspend"

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (46 commits)
    drivers: thermal: add check when unregistering cpu cooling
    thermal: thermal_core: allow binding with limits on bind_params
    drivers: thermal: make usage of CONFIG_THERMAL_HWMON optional
    drivers: thermal: parent virtual hwmon with thermal zone
    thermal: hwmon: move hwmon support to single file
    thermal: exynos: Clean up non-DT remnants
    thermal: exynos: Fix potential NULL pointer dereference
    thermal: exynos: Fix typos in Kconfig
    thermal: ti-soc-thermal: Ensure to compute thermal trend
    thermal: ti-soc-thermal: Set the bandgap mask counter delay value
    thermal: ti-soc-thermal: Initialize counter_delay field for TI DRA752 sensors
    thermal: step_wise: return instance->target by default
    thermal: step_wise: cdev only needs update on a new target state
    Thermal/cpu_cooling: Return directly for the cpu out of allowed_cpus in the cpufreq_thermal_notifier()
    thermal: exynos_tmu: fix wrong error check for mapped memory
    thermal: imx: implement thermal alarm interrupt handling
    thermal: imx: dynamic passive and SoC specific critical trip points
    Documentation: thermal: Explain the exynos thermal driver model
    ARM: dts: thermal: exynos: Add documentation for Exynos SoC thermal bindings
    thermal: exynos: Support for TMU regulator defined at device tree
    ...

    Linus Torvalds
     
  • Pull CIFS fixes from Steve French:
    "CIFS update including case insensitive file name matching improvements
    for UTF-8 to Unicode, various small cifs fixes, SMB2/SMB3 leasing
    improvements, support for following SMB2 symlinks, SMB3 packet signing
    improvements"

    * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: (25 commits)
    CIFS: Respect epoch value from create lease context v2
    CIFS: Add create lease v2 context for SMB3
    CIFS: Move parsing lease buffer to ops struct
    CIFS: Move creating lease buffer to ops struct
    CIFS: Store lease state itself rather than a mapped oplock value
    CIFS: Replace clientCanCache* bools with an integer
    [CIFS] quiet sparse compile warning
    cifs: Start using per session key for smb2/3 for signature generation
    cifs: Add a variable specific to NTLMSSP for key exchange.
    cifs: Process post session setup code in respective dialect functions.
    CIFS: convert to use le32_add_cpu()
    CIFS: Fix missing lease break
    CIFS: Fix a memory leak when a lease break comes
    cifs: add winucase_convert.pl to Documentation/ directory
    cifs: convert case-insensitive dentry ops to use new case conversion routines
    cifs: add new case-insensitive conversion routines that are based on wchar_t's
    [CIFS] Add Scott to list of cifs contributors
    cifs: Move and expand MAX_SERVER_SIZE definition
    cifs: Expand max share name length to 256
    cifs: Move string length definitions to uapi
    ...

    Linus Torvalds
     
  • Pull dma-buf updates from Sumit Semwal:
    "Yet another small one - dma-buf framework now supports size discovery
    of the buffer via llseek"

    * tag 'for-3.12' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
    dma-buf: Expose buffer size to userspace (v2)
    dma-buf: Check return value of anon_inode_getfile

    Linus Torvalds
     
  • Merge first patch-bomb from Andrew Morton:
    - Some pidns/fork/exec tweaks
    - OCFS2 updates
    - Most of MM - there remain quite a few memcg parts which depend on
    pending core cgroups changes. Which might have been already merged -
    I'll check tomorrow...
    - Various misc stuff all over the place
    - A few block bits which I never got around to sending to Jens -
    relatively minor things.
    - MAINTAINERS maintenance
    - A small number of lib/ updates
    - checkpatch updates
    - epoll
    - firmware/dmi-scan
    - Some kprobes work for S390
    - drivers/rtc updates
    - hfsplus feature work
    - vmcore feature work
    - rbtree upgrades
    - AOE updates
    - pktcdvd cleanups
    - PPS
    - memstick
    - w1
    - New "inittmpfs" feature, which does the obvious
    - More IPC work from Davidlohr.

    * emailed patches from Andrew Morton : (303 commits)
    lz4: fix compression/decompression signedness mismatch
    ipc: drop ipc_lock_check
    ipc, shm: drop shm_lock_check
    ipc: drop ipc_lock_by_ptr
    ipc, shm: guard against non-existant vma in shmdt(2)
    ipc: document general ipc locking scheme
    ipc,msg: drop msg_unlock
    ipc: rename ids->rw_mutex
    ipc,shm: shorten critical region for shmat
    ipc,shm: cleanup do_shmat pasta
    ipc,shm: shorten critical region for shmctl
    ipc,shm: make shmctl_nolock lockless
    ipc,shm: introduce shmctl_nolock
    ipc: drop ipcctl_pre_down
    ipc,shm: shorten critical region in shmctl_down
    ipc,shm: introduce lockless functions to obtain the ipc object
    initmpfs: use initramfs if rootfstype= or root= specified
    initmpfs: make rootfs use tmpfs when CONFIG_TMPFS enabled
    initmpfs: move rootfs code from fs/ramfs/ to init/
    initmpfs: move bdi setup from init_rootfs to init_ramfs
    ...

    Linus Torvalds
     
  • Command line option rootfstype=ramfs to obtain old initramfs behavior, and
    use ramfs instead of tmpfs for stub when root= defined (for cosmetic
    reasons).

    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Rob Landley
    Cc: Jeff Layton
    Cc: Jens Axboe
    Cc: Stephen Warren
    Cc: Rusty Russell
    Cc: Jim Cromie
    Cc: Sam Ravnborg
    Cc: Greg Kroah-Hartman
    Cc: "Eric W. Biederman"
    Cc: Alexander Viro
    Cc: "H. Peter Anvin"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Rob Landley
     
  • When the example udev rules in the documentation are used without
    modification, warnings like the one shown below appear in the system logs:

    /var/log/messages:Aug 22 11:09:11 kung udevd[445]: NAME="%k" \
    is superfluous and breaks kernel supplied names, please remove \
    it from /etc/udev/rules.d/60-aoe.rules:26

    Removing the term does not cause any problems with the creation of the
    special character and block device nodes.

    Signed-off-by: Ed Cashin
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ed Cashin
     
  • Fix mistake in the description of Committed_AS in kernel documentation.

    Signed-off-by: Minto Joseph
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Minto Joseph
     
  • Add a new %P variable to be used in core_pattern. This variable contains
    the global PID (PID in the init namespace) as %p contains the PID in the
    current namespace which isn't always what we want.

    The main use for this is to make it easier to handle crashes that happened
    within a container. With that new variables it's possible to have the
    crashes dumped into the container or forwarded to the host with the right
    PID (from the host's point of view).

    Signed-off-by: Stéphane Graber
    Reported-by: Hans Feldt
    Cc: Alexander Viro
    Cc: Eric W. Biederman
    Cc: Andy Whitcroft
    Acked-by: Serge E. Hallyn
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stéphane Graber
     
  • Palmas series device like TPS65913, TPS80036 supports the backup battery
    for powering the RTC when no other energy source is available.

    The backup battery is optional, connected to the VBACKUP pin, and can be
    nonrechargeable or rechargeable. The rechargeable battery can be charged
    from the system supply using the backup battery charger.

    Add support for enabling charging of this backup battery. Also add the DT
    binding document and the new properties to have this support.

    Signed-off-by: Laxman Dewangan
    Reviewed-by: Felipe Balbi
    Acked-by: Kumar Gala
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Laxman Dewangan
     
  • On some platforms (like AM33xx), a special register (RTC_IRQWAKEEN) is
    available to enable Alarm Wakeup feature. This register needs to be
    properly handled for the rtcwake to work properly.

    Platforms using such IP should set "ti,am3352-rtc" in rtc device dt
    compatibility node.

    Signed-off-by: Hebbar Gururaja
    Acked-by: Kevin Hilman
    Acked-by: Sekhar Nori
    Cc: Grant Likely
    Cc: Rob Herring
    Cc: Rob Landley
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hebbar Gururaja
     
  • Add RTC driver for MOXA ART SoCs.

    Signed-off-by: Jonas Jensen
    Reviewed-by: Mark Brown
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jonas Jensen
     
  • Pavel reported that in case if vma area get unmapped and then mapped (or
    expanded) in-place, the soft dirty tracker won't be able to recognize this
    situation since it works on pte level and ptes are get zapped on unmap,
    loosing soft dirty bit of course.

    So to resolve this situation we need to track actions on vma level, there
    VM_SOFTDIRTY flag comes in. When new vma area created (or old expanded)
    we set this bit, and keep it here until application calls for clearing
    soft dirty bit.

    Thus when user space application track memory changes now it can detect if
    vma area is renewed.

    Reported-by: Pavel Emelyanov
    Signed-off-by: Cyrill Gorcunov
    Cc: Andy Lutomirski
    Cc: Matt Mackall
    Cc: Xiao Guangrong
    Cc: Marcelo Tosatti
    Cc: KOSAKI Motohiro
    Cc: Stephen Rothwell
    Cc: Peter Zijlstra
    Cc: "Aneesh Kumar K.V"
    Cc: Rob Landley
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Cyrill Gorcunov
     
  • Now hugepage migration is enabled, although restricted on pmd-based
    hugepages for now (due to lack of testing.) So we should allocate
    migratable hugepages from ZONE_MOVABLE if possible.

    This patch makes GFP flags in hugepage allocation dependent on migration
    support, not only the value of hugepages_treat_as_movable. It provides no
    change on the behavior for architectures which do not support hugepage
    migration,

    Signed-off-by: Naoya Horiguchi
    Acked-by: Andi Kleen
    Reviewed-by: Wanpeng Li
    Cc: Hillf Danton
    Cc: Mel Gorman
    Cc: Hugh Dickins
    Cc: KOSAKI Motohiro
    Cc: Michal Hocko
    Cc: Rik van Riel
    Cc: "Aneesh Kumar K.V"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Naoya Horiguchi
     
  • Explicitly mention/recommend using the libhugetlbfs test cases when
    changing related kernel code. Developers that are unaware of the project
    can easily miss this and introduce potential regressions that may or may
    not be caught by community review.

    Also do some cleanups that make the document visually easier to view at a
    first glance.

    Signed-off-by: Davidlohr Bueso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Davidlohr Bueso
     
  • Read block device partition table from command line. The partition used
    for fixed block device (eMMC) embedded device. It is no MBR, save
    storage space. Bootloader can be easily accessed by absolute address of
    data on the block device. Users can easily change the partition.

    This code reference MTD partition, source "drivers/mtd/cmdlinepart.c"
    About the partition verbose reference
    "Documentation/block/cmdline-partition.txt"

    [akpm@linux-foundation.org: fix printk text]
    [yongjun_wei@trendmicro.com.cn: fix error return code in parse_parts()]
    Signed-off-by: Cai Zhiyong
    Cc: Karel Zak
    Cc: "Wanglin (Albert)"
    Cc: Marius Groeger
    Cc: David Woodhouse
    Cc: Jens Axboe
    Cc: Brian Norris
    Cc: Artem Bityutskiy
    Signed-off-by: Wei Yongjun
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Cai Zhiyong
     
  • Pull networking fixes from David Miller:

    1) Brown paper bag fix in HTB scheduler, class options set incorrectly
    due to a typoe. Fix from Vimalkumar.

    2) It's possible for the ipv6 FIB garbage collector to run before all
    the necessary datastructure are setup during init, defer the
    notifier registry to avoid this problem. Fix from Michal Kubecek.

    3) New i40e ethernet driver from the Intel folks.

    4) Add new qmi wwan device IDs, from Bjørn Mork.

    5) Doorbell lock in bnx2x driver is not initialized properly in some
    configurations, fix from Ariel Elior.

    6) Revert an ipv6 packet option padding change that broke standardized
    ipv6 implementation test suites. From Jiri Pirko.

    7) Fix synchronization of ARP information in bonding layer, from
    Nikolay Aleksandrov.

    8) Fix missing error return resulting in illegal memory accesses in
    openvswitch, from Daniel Borkmann.

    9) SCTP doesn't signal poll events properly due to mistaken operator
    precedence, fix also from Daniel Borkmann.

    10) __netdev_pick_tx() passes wrong index to sk_tx_queue_set() which
    essentially disables caching of TX queue in sockets :-/ Fix from
    Eric Dumazet.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits)
    net_sched: htb: fix a typo in htb_change_class()
    net: qmi_wwan: add new Qualcomm devices
    ipv6: don't call fib6_run_gc() until routing is ready
    net: tilegx driver: avoid compiler warning
    fib6_rules: fix indentation
    irda: vlsi_ir: Remove casting the return value which is a void pointer
    irda: donauboe: Remove casting the return value which is a void pointer
    net: fix multiqueue selection
    net: sctp: fix smatch warning in sctp_send_asconf_del_ip
    net: sctp: fix bug in sctp_poll for SOCK_SELECT_ERR_QUEUE
    net: fib: fib6_add: fix potential NULL pointer dereference
    net: ovs: flow: fix potential illegal memory access in __parse_flow_nlattrs
    bcm63xx_enet: remove deprecated IRQF_DISABLED
    net: korina: remove deprecated IRQF_DISABLED
    macvlan: Move skb_clone check closer to call
    qlcnic: Fix warning reported by kbuild test robot.
    bonding: fix bond_arp_rcv setting and arp validate desync state
    bonding: fix store_arp_validate race with mode change
    ipv6/exthdrs: accept tlv which includes only padding
    bnx2x: avoid atomic allocations during initialization
    ...

    Linus Torvalds
     

11 Sep, 2013

8 commits

  • Pull kconfig updates from Michal Marek:
    "This is the kconfig part of kbuild for v3.12-rc1:
    - post-3.11 search code fixes and micro-optimizations
    - CONFIG_MODULES is no longer a special case; this is needed to
    eventually fix the bug that using KCONFIG_ALLCONFIG breaks
    allmodconfig
    - long long is used to store hex and int values
    - make silentoldconfig no longer warns when a symbol changes from
    tristate to bool (it's a job for make oldconfig)
    - scripts/diffconfig updated to work with newer Pythons
    - scripts/config does not rely on GNU sed extensions"

    * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    kconfig: do not allow more than one symbol to have 'option modules'
    kconfig: regenerate bison parser
    kconfig: do not special-case 'MODULES' symbol
    diffconfig: Update script to support python versions 2.5 through 3.3
    diffconfig: Gracefully exit if the default config files are not present
    modules: do not depend on kconfig to set 'modules' option to symbol MODULES
    kconfig: silence warning when parsing auto.conf when a symbol has changed type
    scripts/config: use sed's POSIX interface
    kconfig: switch to "long long" for sanity
    kconfig: simplify symbol-search code
    kconfig: don't allocate n+1 elements in temporary array
    kconfig: minor style fixes in symbol-search code
    kconfig/[mn]conf: shorten title in search-box
    kconfig: avoid multiple calls to strlen
    Documentation/kconfig: more concise and straightforward search explanation

    Linus Torvalds
     
  • This patch adds the changes for Kconfig, i40e.txt, MAINTAINERS, Kbuild
    and new i40e/Makefile to build i40e with the kernel.

    New driver build option is CONFIG_I40E

    Signed-off-by: Jesse Brandeburg
    Signed-off-by: Shannon Nelson
    CC: PJ Waskiewicz
    CC: e1000-devel@lists.sourceforge.net
    Tested-by: Kavindya Deegala
    Signed-off-by: Jeff Kirsher

    Jesse Brandeburg
     
  • Pull battery/power supply driver updates from Anton Vorontsov:
    "New drivers:

    - APM X-Gene system reboot driver by Feng Kan and Loc Ho (APM).

    - Qualcomm MSM reboot/poweroff driver by Abhimanyu Kapur (Codeaurora).

    - Texas Instruments BQ24190 charger driver by Mark A. Greer (Animal
    Creek Technologies).

    - Texas Instruments TWL4030 MADC battery driver by Lukas Märdian and
    Marek Belisko (Golden Delicious Computers). The driver is used on
    Freerunner GTA04 phones.

    Highlighted fixes and improvements:

    - Suspend/wakeup logic improvements: power supply objects will block
    system suspend until all power supply events are processed. Thanks
    to Zoran Markovic (Linaro), Arve Hjonnevag and Todd Poynor (Google)"

    * tag 'for-v3.12' of git://git.infradead.org/battery-2.6:
    rx51_battery: Fix channel number when reading adc value
    power: Add twl4030_madc battery driver.
    bq24190_charger: Workaround SS definition problem on i386 builds
    power_supply: Prevent suspend until power supply events are processed
    vexpress-poweroff: Should depend on the required infrastructure
    twl4030-charger: Fix compiler warning with regulator_enable()
    rx51_battery: Replace hardcoded channels values.
    bq24190_charger: Add support for TI BQ24190 Battery Charger
    ab8500-charger: We print an unintended error message
    max8925_power: Fix missing of_node_put
    power_supply: Replace strict_strtol() with kstrtol()
    power: Add APM X-Gene system reboot driver
    power_supply: tosa_battery: Get rid of irq_to_gpio usage
    power supply: collie_battery: Convert to use dev_pm_ops
    power_supply: Make goldfish_battery depend on GOLDFISH || COMPILE_TEST
    power: reset: Add msm restart support
    MAINTAINERS: drivers/power: add entry for SmartReflex AVS drivers

    Linus Torvalds
     
  • For a long time no filesystem has been using vfs_follow_link, and as seen
    by recent filesystem submissions any new use is accidental as well.

    Remove vfs_follow_link, document the replacement in
    Documentation/filesystems/porting and also rename __vfs_follow_link
    to match its only caller better.

    Signed-off-by: Christoph Hellwig
    Signed-off-by: Al Viro

    Christoph Hellwig
     
  • Pull device tree core updates from Grant Likely:
    "Generally minor changes. A bunch of bug fixes, particularly for
    initialization and some refactoring. Most notable change if feeding
    the entire flattened tree into the random pool at boot. May not be
    significant, but shouldn't hurt either"

    Tim Bird questions whether the boot time cost of the random feeding may
    be noticeable. And "add_device_randomness()" is definitely not some
    speed deamon of a function.

    * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
    of/platform: add error reporting to of_amba_device_create()
    irq/of: Fix comment typo for irq_of_parse_and_map
    of: Feed entire flattened device tree into the random pool
    of/fdt: Clean up casting in unflattening path
    of/fdt: Remove duplicate memory clearing on FDT unflattening
    gpio: implement gpio-ranges binding document fix
    of: call __of_parse_phandle_with_args from of_parse_phandle
    of: introduce of_parse_phandle_with_fixed_args
    of: move of_parse_phandle()
    of: move documentation of of_parse_phandle_with_args
    of: Fix missing memory initialization on FDT unflattening
    of: consolidate definition of early_init_dt_alloc_memory_arch()
    of: Make of_get_phy_mode() return int i.s.o. const int
    include: dt-binding: input: create a DT header defining key codes.
    of/platform: Staticize of_platform_device_create_pdata()
    of: Specify initrd location using 64-bit
    dt: Typo fix
    OF: make of_property_for_each_{u32|string}() use parameters if OF is not enabled

    Linus Torvalds
     
  • Pull slave-dmaengine updates from Vinod Koul:
    "This pull brings:
    - Andy's DW driver updates
    - Guennadi's sh driver updates
    - Pl08x driver fixes from Tomasz & Alban
    - Improvements to mmp_pdma by Daniel
    - TI EDMA fixes by Joel
    - New drivers:
    - Hisilicon k3dma driver
    - Renesas rcar dma driver
    - New API for publishing slave driver capablities
    - Various fixes across the subsystem by Andy, Jingoo, Sachin etc..."

    * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (94 commits)
    dma: edma: Remove limits on number of slots
    dma: edma: Leave linked to Null slot instead of DUMMY slot
    dma: edma: Find missed events and issue them
    ARM: edma: Add function to manually trigger an EDMA channel
    dma: edma: Write out and handle MAX_NR_SG at a given time
    dma: edma: Setup parameters to DMA MAX_NR_SG at a time
    dmaengine: pl330: use dma_set_max_seg_size to set the sg limit
    dmaengine: dma_slave_caps: remove sg entries
    dma: replace devm_request_and_ioremap by devm_ioremap_resource
    dma: ste_dma40: Fix potential null pointer dereference
    dma: ste_dma40: Remove duplicate const
    dma: imx-dma: Remove redundant NULL check
    dma: dmagengine: fix function names in comments
    dma: add driver for R-Car HPB-DMAC
    dma: k3dma: use devm_ioremap_resource() instead of devm_request_and_ioremap()
    dma: imx-sdma: Staticize sdma_driver_data structures
    pch_dma: Add MODULE_DEVICE_TABLE
    dmaengine: PL08x: Add cyclic transfer support
    dmaengine: PL08x: Fix reading the byte count in cctl
    dmaengine: PL08x: Add support for different maximum transfer size
    ...

    Linus Torvalds
     
  • Pull MMC updates from Chris Ball:
    "MMC highlights for 3.12:

    Core:
    - Support Allocation Units 8MB-64MB in SD3.0, previous max was 4MB.
    - The slot-gpio helper can now handle GPIO debouncing card-detect.
    - Read supported voltages from DT "voltage-ranges" property.

    Drivers:
    - dw_mmc: Add support for ARC architecture, and support exynos5420.
    - mmc_spi: Support CD/RO GPIOs.
    - sh_mobile_sdhi: Add compatibility for more Renesas SoCs.
    - sh_mmcif: Add DT support for DMA channels"

    * tag 'mmc-updates-for-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (50 commits)
    Revert "mmc: tmio-mmc: Remove .set_pwr() callback from platform data"
    mmc: dw_mmc: Add support for ARC
    mmc: sdhci-s3c: initialize host->quirks2 for using quirks2
    mmc: sdhci-s3c: fix the wrong register value, when clock is disabled
    mmc: esdhc: add support to get voltage from device-tree
    mmc: sdhci: get voltage from sdhc host
    mmc: core: parse voltage from device-tree
    mmc: omap_hsmmc: use the generic config for omap2plus devices
    mmc: omap_hsmmc: clear status flags before starting a new command
    mmc: dw_mmc: exynos: Add a new compatible string for exynos5420
    mmc: sh_mmcif: revision-specific CLK_CTRL2 handling
    mmc: sh_mmcif: revision-specific Command Completion Signal handling
    mmc: sh_mmcif: add support for Device Tree DMA bindings
    mmc: sh_mmcif: move header include from header into .c
    mmc: SDHI: add DT compatibility strings for further SoCs
    mmc: dw_mmc-pci: enable bus-mastering mode
    mmc: dw_mmc-pci: get resources from a proper BAR
    mmc: tmio-mmc: Remove .set_pwr() callback from platform data
    mmc: tmio-mmc: Remove .get_cd() callback from platform data
    mmc: sh_mobile_sdhi: Remove .set_pwr() callback from platform data
    ...

    Linus Torvalds
     
  • Pull device-mapper updates from Mike Snitzer:
    "Add the ability to collect I/O statistics on user-defined regions of a
    device-mapper device. This dm-stats code required the reintroduction
    of a div64_u64_rem() helper, but as a separate method that doesn't
    slow down div64_u64() -- especially on 32-bit systems.

    Allow the error target to replace request-based DM devices (e.g.
    multipath) in addition to bio-based DM devices.

    Various other small code fixes and improvements to thin-provisioning,
    DM cache and the DM ioctl interface"

    * tag 'dm-3.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
    dm stripe: silence a couple sparse warnings
    dm: add statistics support
    dm thin: always return -ENOSPC if no_free_space is set
    dm ioctl: cleanup error handling in table_load
    dm ioctl: increase granularity of type_lock when loading table
    dm ioctl: prevent rename to empty name or uuid
    dm thin: set pool read-only if breaking_sharing fails block allocation
    dm thin: prefix pool error messages with pool device name
    dm: allow error target to replace bio-based and request-based targets
    math64: New separate div64_u64_rem helper
    dm space map: optimise sm_ll_dec and sm_ll_inc
    dm btree: prefetch child nodes when walking tree for a dm_btree_del
    dm btree: use pop_frame in dm_btree_del to cleanup code
    dm cache: eliminate holes in cache structure
    dm cache: fix stacking of geometry limits
    dm thin: fix stacking of geometry limits
    dm thin: add data block size limits to Documentation
    dm cache: add data block size limits to code and Documentation
    dm cache: document metadata device is exclussive to a cache
    dm: stop using WQ_NON_REENTRANT

    Linus Torvalds
     

10 Sep, 2013

6 commits

  • Each dma-buf has an associated size and it's reasonable for userspace
    to want to know what it is.

    Since userspace already has an fd, expose the size using the
    size = lseek(fd, SEEK_END, 0); lseek(fd, SEEK_CUR, 0);
    idiom.

    v2: Added Daniel's sugeested documentation, with minor fixups

    Signed-off-by: Christopher James Halse Rogers
    Reviewed-by: Daniel Vetter
    Tested-by: Daniel Vetter
    Signed-off-by: Sumit Semwal

    Christopher James Halse Rogers
     
  • Pull dmaengine update from Dan Williams:
    "Collection of random updates to the core and some end-driver fixups
    for ioatdma and mv_xor:
    - NUMA aware channel allocation
    - Cleanup dmatest debugfs interface
    - ioat: make raid-support Atom only
    - mv_xor: big endian

    Aside from the top three commits these have all had some soak time in
    -next. The top commit fixes a recent build breakage.

    It has been a long while since my last pull request, hopefully it does
    not show. Thanks to Vinod for keeping an eye on drivers/dma/ this
    past year"

    * tag 'dmaengine-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
    dmaengine: dma_sync_wait and dma_find_channel undefined
    MAINTAINERS: update email for Dan Williams
    dma: mv_xor: Fix incorrect error path
    ioatdma: silence GCC warnings
    dmaengine: make dma_channel_rebalance() NUMA aware
    dmaengine: make dma_submit_error() return an error code
    ioatdma: disable RAID on non-Atom platforms and reenable unaligned copies
    mv_xor: support big endian systems using descriptor swap feature
    mv_xor: use {readl, writel}_relaxed instead of __raw_{readl, writel}
    dmatest: print message on debug level in case of no error
    dmatest: remove IS_ERR_OR_NULL checks of debugfs calls
    dmatest: make module parameters writable

    Linus Torvalds
     
  • Pull clock framework changes from Michael Turquette:
    "The common clk framework changes for 3.12 are dominated by clock
    driver patches, both new drivers and fixes to existing. A high
    percentage of these are for Samsung platforms like Exynos. Core
    framework fixes and some new features like automagical clock
    re-parenting round out the patches"

    * tag 'clk-for-linus-3.12' of git://git.linaro.org/people/mturquette/linux: (102 commits)
    clk: only call get_parent if there is one
    clk: samsung: exynos5250: Simplify registration of PLL rate tables
    clk: samsung: exynos4: Register PLL rate tables for Exynos4x12
    clk: samsung: exynos4: Register PLL rate tables for Exynos4210
    clk: samsung: exynos4: Reorder registration of mout_vpllsrc
    clk: samsung: pll: Add support for rate configuration of PLL46xx
    clk: samsung: pll: Use new registration method for PLL46xx
    clk: samsung: pll: Add support for rate configuration of PLL45xx
    clk: samsung: pll: Use new registration method for PLL45xx
    clk: samsung: exynos4: Rename exynos4_plls to exynos4x12_plls
    clk: samsung: exynos4: Remove checks for DT node
    clk: samsung: exynos4: Remove unused static clkdev aliases
    clk: samsung: Modify _get_rate() helper to use __clk_lookup()
    clk: samsung: exynos4: Use separate aliases for cpufreq related clocks
    clocksource: samsung_pwm_timer: Get clock from device tree
    ARM: dts: exynos4: Specify PWM clocks in PWM node
    pwm: samsung: Update DT bindings documentation to cover clocks
    clk: Move symbol export to proper location
    clk: fix new_parent dereference before null check
    clk: wm831x: Initialise wm831x pointer on init
    ...

    Linus Torvalds
     
  • Pull mtd updates from David Woodhouse:
    - factor out common code from MTD tests
    - nand-gpio cleanup and portability to non-ARM
    - m25p80 support for 4-byte addressing chips, other new chips
    - pxa3xx cleanup and support for new platforms
    - remove obsolete alauda, octagon-5066 drivers
    - erase/write support for bcm47xxsflash
    - improve detection of ECC requirements for NAND, controller setup
    - NFC acceleration support for atmel-nand, read/write via SRAM
    - etc

    * tag 'for-linus-20130909' of git://git.infradead.org/linux-mtd: (184 commits)
    mtd: chips: Add support for PMC SPI Flash chips in m25p80.c
    mtd: ofpart: use for_each_child_of_node() macro
    mtd: mtdswap: replace strict_strtoul() with kstrtoul()
    mtd cs553x_nand: use kzalloc() instead of memset
    mtd: atmel_nand: fix error return code in atmel_nand_probe()
    mtd: bcm47xxsflash: writing support
    mtd: bcm47xxsflash: implement erasing support
    mtd: bcm47xxsflash: convert to module_platform_driver instead of init/exit
    mtd: bcm47xxsflash: convert kzalloc to avoid invalid access
    mtd: remove alauda driver
    mtd: nand: mxc_nand: mark 'const' properly
    mtd: maps: cfi_flagadm: add missing __iomem annotation
    mtd: spear_smi: add missing __iomem annotation
    mtd: r852: Staticize local symbols
    mtd: nandsim: Staticize local symbols
    mtd: impa7: add missing __iomem annotation
    mtd: sm_ftl: Staticize local symbols
    mtd: m25p80: add support for mr25h10
    mtd: m25p80: make CONFIG_M25PXX_USE_FAST_READ safe to enable
    mtd: m25p80: Pass flags through CAT25_INFO macro
    ...

    Linus Torvalds
     
  • Pull DMA mapping update from Marek Szyprowski:
    "This contains an addition of Device Tree support for reserved memory
    regions (Contiguous Memory Allocator is one of the drivers for it) and
    changes required by the KVM extensions for PowerPC architectue"

    * 'for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
    ARM: init: add support for reserved memory defined by device tree
    drivers: of: add initialization code for dma reserved memory
    drivers: of: add function to scan fdt nodes given by path
    drivers: dma-contiguous: clean source code and prepare for device tree

    Linus Torvalds
     
  • Pull VFIO update from Alex Williamson:
    "VFIO updates include safer default file flags for VFIO device fds, an
    external user interface exported to allow other modules to hold
    references to VFIO groups, a fix to test for extended config space on
    PCIe and PCI-x, and new hot reset interfaces for PCI devices which
    allows the user to do PCI bus/slot resets when all of the devices
    affected by the reset are owned by the user.

    For this last feature, the PCI bus reset interface, I depend on
    changes already merged from Bjorn's PCI pull request. I therefore
    merged my tree up to commit cb3e433, which I think was the correct
    action, but as Stephen Rothwell noted, I failed to provide a commit
    message indicating why the merge was required. Sorry for that.
    Thanks, Alex"

    * tag 'vfio-v3.12-rc0' of git://github.com/awilliam/linux-vfio:
    vfio: fix documentation
    vfio-pci: PCI hot reset interface
    vfio-pci: Test for extended config space
    vfio-pci: Use fdget() rather than eventfd_fget()
    vfio: Add O_CLOEXEC flag to vfio device fd
    vfio: use get_unused_fd_flags(0) instead of get_unused_fd()
    vfio: add external user support

    Linus Torvalds