06 Oct, 2013

1 commit

  • With the previous changes, sysfs regular file code is ready to handle
    bin files too. This patch makes bin files share the regular file
    path.

    * sysfs_create/remove_bin_file() are moved to fs/sysfs/file.c.

    * sysfs_init_inode() is updated to use the new sysfs_bin_operations
    instead of bin_fops for bin files.

    * fs/sysfs/bin.c and the related pieces are removed.

    This patch shouldn't introduce any behavior difference to bin file
    accesses.

    Overall, this unification reduces the amount of duplicate logic, makes
    behaviors more consistent and paves the road for building simpler and
    more versatile interface which will allow other subsystems to make use
    of sysfs for their pseudo filesystems.

    v2: Stale fs/sysfs/bin.c reference dropped from
    Documentation/DocBook/filesystems.tmpl. Reported by kbuild test
    robot.

    Signed-off-by: Tejun Heo
    Cc: Kay Sievers
    Cc: kbuild test robot
    Signed-off-by: Greg Kroah-Hartman

    Tejun Heo
     

30 Sep, 2013

1 commit

  • Pull tty/serial fixes from Greg KH:
    "Here are some serial at tty driver fixes for 3.12-rc3

    The serial driver fixes some kref leaks, documentation is moved to the
    proper places, and the tty and n_tty fixes resolve some reported
    regressions. There is still one outstanding tty regression fix that
    isn't in here yet, as I want to test it out some more, it will be sent
    for 3.12-rc4 if it checks out"

    * tag 'tty-3.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
    tty: ar933x_uart: move devicetree binding documentation
    tty: Fix SIGTTOU not sent with tcflush()
    n_tty: Fix EOF push index when termios changes
    serial: pch_uart: remove unnecessary tty_port_tty_get
    serial: pch_uart: fix tty-kref leak in dma-rx path
    serial: pch_uart: fix tty-kref leak in rx-error path
    serial: tegra: fix tty-kref leak

    Linus Torvalds
     

29 Sep, 2013

1 commit


28 Sep, 2013

1 commit

  • Pull sound fixes from Takashi Iwai:
    "Nothing too serious here: a couple of compress-offload core fixes,
    Haswell HDMI audio fix, a fixup for new MacBook Airs and a few COEF
    setups for ALC283 mic problems"

    * tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ALSA: hda - Enable internal mic on a Thinkpad machine with ALC283
    ALSA: hda - Fix Internal Mic boost can't control with ALC283
    ALSA: hda - Add documentation for CS4208 fixups
    ALSA: hda - Add fixup for MacBook Air 6,1 and 6,2 with CS4208 codec
    ALSA : hda - not use assigned converters for all unused pins
    ALSA: compress: Make sure we trigger STOP before closing the stream.
    ALSA: compress: Fix compress device unregister.

    Linus Torvalds
     

27 Sep, 2013

2 commits


26 Sep, 2013

1 commit

  • Pull Xen fixes from Konrad Rzeszutek Wilk:
    "Bug-fixes and one update to the kernel-paramters.txt documentation.

    - Fix PV spinlocks triggering jump_label code bug
    - Remove extraneous code in the tpm front driver
    - Fix ballooning out of pages when non-preemptible
    - Fix deadlock when using a 32-bit initial domain with large amount
    of memory
    - Add xen_nopvpsin parameter to the documentation"

    * tag 'stable/for-linus-3.12-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
    xen/spinlock: Document the xen_nopvspin parameter.
    xen/p2m: check MFN is in range before using the m2p table
    xen/balloon: don't alloc page while non-preemptible
    xen: Do not enable spinlocks before jump_label_init() has executed
    tpm: xen-tpmfront: Remove the locality sysfs attribute
    tpm: xen-tpmfront: Fix default durations

    Linus Torvalds
     

25 Sep, 2013

2 commits

  • Which disables in the ticketlock slowpath the Xen PV optimization's.
    Useful for diagnosing issues and comparing benchmarks in
    over-commit CPU scenarios.

    Signed-off-by: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     
  • s/Synopsis/Synopsys
    s/synopsis/synopsys

    Signed-off-by: Dinh Nguyen
    Cc: Pavel Machek
    CC: Arnd Bergmann
    CC: Olof Johansson
    Cc: Rob Herring
    Cc: Pawel Moll
    Cc: Mark Rutland
    Cc: Stephen Warren
    Cc: Ian Campbell
    Cc: Chris Ball
    Cc: Jaehoon Chung
    Cc: Seungwon Jeon
    Cc: Tomasz Figa
    Cc: devicetree@vger.kernel.org
    Cc: linux-mmc@vger.kernel.org
    CC: linux-arm-kernel@lists.infradead.org
    Acked-by: Olof Johansson
    Signed-off-by: Rob Herring

    Dinh Nguyen
     

20 Sep, 2013

3 commits

  • Pull ARM64 fixes from Catalin Marinas:
    - Compat register fault reporting fix
    - Documentation clarification on tagged pointers
    - hwcap widened to 64-bit (user space already reading it as 64-bit)

    * tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
    arm64: Widen hwcap to be 64 bit
    arm64: Correctly report LR and SP for compat tasks
    arm64: documentation: tighten up tagged pointer documentation
    arm64: Make do_bad_area() function static

    Linus Torvalds
     
  • Commit d50240a5f6ce ("arm64: mm: permit use of tagged pointers at EL0")
    added support for tagged pointers in userspace, but the corresponding
    update to Documentation/ contained some imprecise statements.

    This patch fixes up some minor ambiguities in the text, hopefully making
    it more clear about exactly what the kernel expects from user virtual
    addresses.

    Signed-off-by: Will Deacon
    Signed-off-by: Catalin Marinas

    Will Deacon
     
  • Pull networking fixes from David Miller:

    1) If the local_df boolean is set on an SKB we have to allocate a
    unique ID even if IP_DF is set in the ipv4 headers, from Ansis
    Atteka.

    2) Some fixups for the new chipset support that went into the sfc
    driver, from Ben Hutchings.

    3) Because SCTP bypasses a good chunk of, and actually duplicates, the
    logic of the ipv6 output path, some IPSEC things don't get done
    properly. Integrate SCTP better into the ipv6 output path so that
    these problems are fixed and such issues don't get missed in the
    future either. From Daniel Borkmann.

    4) Fix skge regressions added by the DMA mapping error return checking
    added in v3.10, from Mikulas Patocka.

    5) Kill some more IRQF_DISABLED references, from Michael Opdenacker.

    6) Fix races and deadlocks in the bridging code, from Hong Zhiguo.

    7) Fix error handling in tun_set_iff(), in particular don't leak
    resources. From Jason Wang.

    8) Prevent format-string injection into xen-netback driver, from Kees
    Cook.

    9) Fix regression added to netpoll ARP packet handling, in particular
    check for the right ETH_P_ARP protocol code. From Sonic Zhang.

    10) Try to deal with AMD IOMMU errors when using r8169 chips, from
    Francois Romieu.

    11) Cure freezes due to recent changes in the rt2x00 wireless driver,
    from Stanislaw Gruszka.

    12) Don't do SPI transfers (which can sleep) in interrupt context in
    cw1200 driver, from Solomon Peachy.

    13) Fix LEDs handling bug in 5720 tg3 chips already handled for 5719.
    From Nithin Sujir.

    14) Make xen_netbk_count_skb_slots() count the actual number of slots
    that will be used, taking into consideration packing and other
    issues that the transmit path will run into. From David Vrabel.

    15) Use the correct maximum age when calculating the bridge
    message_age_timer, from Chris Healy.

    16) Get rid of memory leaks in mcs7780 IRDA driver, from Alexey
    Khoroshilov.

    17) Netfilter conntrack extensions were converted to RCU but are not
    always freed properly using kfree_rcu(). Fix from Michal Kubecek.

    18) VF reset recovery not being done correctly in qlcnic driver, from
    Manish Chopra.

    19) Fix inverted test in ATM nicstar driver, from Andy Shevchenko.

    20) Missing workqueue destroy in cxgb4 error handling, from Wei Yang.

    21) Internal switch not initialized properly in bgmac driver, from Rafał
    Miłecki.

    22) Netlink messages report wrong local and remote addresses in IPv6
    tunneling, from Ding Zhi.

    23) ICMP redirects should not generate socket errors in DCCP and SCTP.
    We're still working out how this should be handled for RAW and UDP
    sockets. From Daniel Borkmann and Duan Jiong.

    24) We've had several bugs wherein the network namespace's loopback
    device gets accessed after it is free'd, NULL it out so that we can
    catch these problems more readily. From Eric W Biederman.

    25) Fix regression in TCP RTO calculations, from Neal Cardwell.

    26) Fix too early free of xen-netback network device when VIFs still
    exist. From Paul Durrant.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (87 commits)
    netconsole: fix a deadlock with rtnl and netconsole's mutex
    netpoll: fix NULL pointer dereference in netpoll_cleanup
    skge: fix broken driver
    ip: generate unique IP identificator if local fragmentation is allowed
    ip: use ip_hdr() in __ip_make_skb() to retrieve IP header
    xen-netback: Don't destroy the netdev until the vif is shut down
    net:dccp: do not report ICMP redirects to user space
    cnic: Fix crash in cnic_bnx2x_service_kcq()
    bnx2x, cnic, bnx2i, bnx2fc: Fix bnx2i and bnx2fc regressions.
    vxlan: Avoid creating fdb entry with NULL destination
    tcp: fix RTO calculated from cached RTT
    drivers: net: phy: cicada.c: clears warning Use #include instead of
    net loopback: Set loopback_dev to NULL when freed
    batman-adv: set the TAG flag for the vid passed to BLA
    netfilter: nfnetlink_queue: use network skb for sequence adjustment
    net: sctp: rfc4443: do not report ICMP redirects to user space
    net: usb: cdc_ether: use usb.h macros whenever possible
    net: usb: cdc_ether: fix checkpatch errors and warnings
    net: usb: cdc_ether: Use wwan interface for Telit modules
    ip6_tunnels: raddr and laddr are inverted in nl msg
    ...

    Linus Torvalds
     

19 Sep, 2013

2 commits

  • Pull vfs fixes from Al Viro:
    "atomic_open-related fixes (Miklos' series, with EEXIST-related parts
    replaced with fix in fs/namei.c:atomic_open() instead of messing with
    the instances) + race fix in autofs + leak on failure exit in 9p"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
    9p: don't forget to destroy inode cache if fscache registration fails
    atomic_open: take care of EEXIST in no-open case with O_CREAT|O_EXCL in fs/namei.c
    vfs: don't set FILE_CREATED before calling ->atomic_open()
    nfs: set FILE_CREATED
    gfs2: set FILE_CREATED
    cifs: fix filp leak in cifs_atomic_open()
    vfs: improve i_op->atomic_open() documentation
    autofs4: close the races around autofs4_notify_daemon()

    Linus Torvalds
     
  • Pull scheduler fixes from Ingo Molnar:
    "Misc fixes"

    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    sched: Fix comment for sched_info_depart
    sched/Documentation: Update sched-design-CFS.txt documentation
    sched/debug: Take PID namespace into account
    sched/fair: Fix small race where child->se.parent,cfs_rq might point to invalid ones

    Linus Torvalds
     

17 Sep, 2013

3 commits

  • Fix documentation of ->atomic_open() and related functions: finish_open()
    and finish_no_open(). Also add details that seem to be unclear and a
    source of bugs (some of which are fixed in the following series).

    Cc-ing maintainers of all filesystems implementing ->atomic_open().

    Signed-off-by: Miklos Szeredi
    Cc: Eric Van Hensbergen
    Cc: Sage Weil
    Cc: Steve French
    Cc: Steven Whitehouse
    Cc: Trond Myklebust
    Signed-off-by: Al Viro

    Miklos Szeredi
     
  • 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

2 commits

  • running bonding in ALB mode requires that learning packets be sent periodically,
    so that the switch knows where to send responding traffic. However, depending
    on switch configuration, there may not be any need to send traffic at the
    default rate of 3 packets per second, which represents little more than wasted
    data. Allow the ALB learning packet interval to be made configurable via sysfs

    Signed-off-by: Neil Horman
    Acked-by: Acked-by: Veaceslav Falico
    CC: Jay Vosburgh
    CC: Andy Gospodarek
    CC: "David S. Miller"
    Signed-off-by: Andy Gospodarek
    Signed-off-by: David S. Miller

    Neil Horman
     
  • 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

6 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
     
  • 2bd2d6f2dc ("sched: Replace use of entity_key()") had remove the
    entity_key() which function is to subtract a tasks vruntime by
    its groups minvruntime as the rbtree key.
    The phrase "there is a subtraction using rq->cfs.min_vruntime
    to account for possible wraparounds" in documentation feels strange
    and meaningless. So remove it.

    Signed-off-by: Li Bin
    Signed-off-by: Peter Zijlstra
    Link: http://lkml.kernel.org/r/1378706740-7500-1-git-send-email-huawei.libin@huawei.com
    Signed-off-by: Ingo Molnar

    Li Bin
     

12 Sep, 2013

14 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