18 Sep, 2012

12 commits

  • On some platforms, bootloaders are known to do some interesting RTC
    programming. Without going into the obscurities as to why this may be
    the case, suffice it to say the the driver should not make any
    assumptions about the state of the RTC when the driver loads. In
    particular, the driver probe should be sure that all interrupts are
    disabled until otherwise programmed.

    This was discovered when finding bursty I2C traffic every second on
    Overo platforms. This I2C overhead was keeping the SoC from hitting
    deep power states. The cause was found to be the RTC firing every
    second on the I2C-connected TWL PMIC.

    Special thanks to Felipe Balbi for suggesting to look for a rogue driver
    as the source of the I2C traffic rather than the I2C driver itself.

    Special thanks to Steve Sakoman for helping track down the source of the
    continuous RTC interrups on the Overo boards.

    Signed-off-by: Kevin Hilman
    Cc: Felipe Balbi
    Tested-by: Steve Sakoman
    Cc: Alessandro Zummo
    Tested-by: Shubhrajyoti Datta
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kevin Hilman
     
  • gcc 4.6+ has support for a externally_visible attribute that prevents the
    optimizer from optimizing unused symbols away. Add a __visible macro to
    use it with that compiler version or later.

    This is used (at least) by the "Link Time Optimization" patchset.

    Signed-off-by: Andi Kleen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andi Kleen
     
  • The kernel doesn't check the pid for negative values, so if you try to
    write -2 to /proc/sys/kernel/ns_last_pid, you will get a kernel panic.

    The crash happens because the next pid is -1, and alloc_pidmap() will
    try to access to a nonexistent pidmap.

    map = &pid_ns->pidmap[pid/BITS_PER_PAGE];

    Signed-off-by: Andrew Vagin
    Acked-by: Cyrill Gorcunov
    Acked-by: Oleg Nesterov
    Cc: Eric W. Biederman
    Cc: Pavel Emelyanov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Vagin
     
  • This warning:

    In file included from linux/include/linux/tcp.h:227:0,
    from linux/include/linux/ipv6.h:221,
    from linux/include/net/ipv6.h:16,
    from linux/include/linux/sunrpc/clnt.h:26,
    from linux/net/sunrpc/stats.c:22:
    linux/include/net/sock.h: In function `sk_rmem_schedule':
    linux/nfs-2.6/include/net/sock.h:1339:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]

    is seen with gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2) using the
    -Wextra option.

    Commit c76562b6709f ("netvm: prevent a stream-specific deadlock")
    accidentally replaced the "size" parameter of sk_rmem_schedule() with an
    unsigned int. This changes the semantics of the comparison in the
    return statement.

    In sk_wmem_schedule we have syntactically the same comparison, but
    "size" is a signed integer. In addition, __sk_mem_schedule() takes a
    signed integer for its "size" parameter, so there is an implicit type
    conversion in sk_rmem_schedule() anyway.

    Revert the "size" parameter back to a signed integer so that the
    semantics of the expressions in both sk_[rw]mem_schedule() are exactly
    the same.

    Signed-off-by: Chuck Lever
    Signed-off-by: Mel Gorman
    Cc: David Miller
    Cc: Joonsoo Kim
    Cc: David Rientjes
    Cc: Pekka Enberg
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Chuck Lever
     
  • get_partial() is currently not checking pfmemalloc_match() meaning that
    it is possible for pfmemalloc pages to leak to non-pfmemalloc users.
    This is a problem in the following situation. Assume that there is a
    request from normal allocation and there are no objects in the per-cpu
    cache and no node-partial slab.

    In this case, slab_alloc enters the slow path and new_slab_objects() is
    called which may return a PFMEMALLOC page. As the current user is not
    allowed to access PFMEMALLOC page, deactivate_slab() is called
    ([5091b74a: mm: slub: optimise the SLUB fast path to avoid pfmemalloc
    checks]) and returns an object from PFMEMALLOC page.

    Next time, when we get another request from normal allocation,
    slab_alloc() enters the slow-path and calls new_slab_objects(). In
    new_slab_objects(), we call get_partial() and get a partial slab which
    was just deactivated but is a pfmemalloc page. We extract one object
    from it and re-deactivate.

    "deactivate -> re-get in get_partial -> re-deactivate" occures repeatedly.

    As a result, access to PFMEMALLOC page is not properly restricted and it
    can cause a performance degradation due to frequent deactivation.
    deactivation frequently.

    This patch changes get_partial_node() to take pfmemalloc_match() into
    account and prevents the "deactivate -> re-get in get_partial()
    scenario. Instead, new_slab() is called.

    Signed-off-by: Joonsoo Kim
    Acked-by: David Rientjes
    Signed-off-by: Mel Gorman
    Cc: David Miller
    Cc: Chuck Lever
    Cc: Pekka Enberg
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joonsoo Kim
     
  • In array cache, there is a object at index 0, check it.

    Signed-off-by: Joonsoo Kim
    Signed-off-by: Mel Gorman
    Cc: David Miller
    Cc: Chuck Lever
    Cc: David Rientjes
    Cc: Pekka Enberg
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joonsoo Kim
     
  • Right now, we call ClearSlabPfmemalloc() for first page of slab when we
    clear SlabPfmemalloc flag. This is fine for most swap-over-network use
    cases as it is expected that order-0 pages are in use. Unfortunately it
    is possible that that __ac_put_obj() checks SlabPfmemalloc on a tail
    page and while this is harmless, it is sloppy. This patch ensures that
    the head page is always used.

    This problem was originally identified by Joonsoo Kim.

    [js1304@gmail.com: Original implementation and problem identification]
    Signed-off-by: Mel Gorman
    Cc: David Miller
    Cc: Chuck Lever
    Cc: Joonsoo Kim
    Cc: David Rientjes
    Cc: Pekka Enberg
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mel Gorman
     
  • Fix a serious but uncommon bug in nbd which occurs when there is heavy
    I/O going to the nbd device while, at the same time, a failure (server,
    network) or manual disconnect of the nbd connection occurs.

    There is a small window between the time that the nbd_thread is stopped
    and the socket is shutdown where requests can continue to be queued to
    nbd's internal waiting_queue. When this happens, those requests are
    never completed or freed.

    The fix is to clear the waiting_queue on shutdown of the nbd device, in
    the same way that the nbd request queue (queue_head) is already being
    cleared.

    Signed-off-by: Paul Clements
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Paul Clements
     
  • Signed-off-by: Gang Wei
    Cc: Richard L Maliszewski
    Cc: Gang Wei
    Cc: Shane Wang
    Cc: Ingo Molnar
    Cc: "H. Peter Anvin"
    Cc: Thomas Gleixner
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Gang Wei
     
  • I found following definition in include/linux/memory.h, in my IA64
    platform, SECTION_SIZE_BITS is equal to 32, and MIN_MEMORY_BLOCK_SIZE
    will be 0.

    #define MIN_MEMORY_BLOCK_SIZE (1 << SECTION_SIZE_BITS)

    Because MIN_MEMORY_BLOCK_SIZE is int type and length of 32bits,
    so MIN_MEMORY_BLOCK_SIZE(1 << 32) will will equal to 0.
    Actually when SECTION_SIZE_BITS >= 31, MIN_MEMORY_BLOCK_SIZE will be wrong.
    This will cause wrong system memory infomation in sysfs.
    I think it should be:

    #define MIN_MEMORY_BLOCK_SIZE (1UL << SECTION_SIZE_BITS)

    And "echo offline > memory0/state" will cause following call trace:

    kernel BUG at mm/memory_hotplug.c:885!
    sh[6455]: bugcheck! 0 [1]
    Pid: 6455, CPU 0, comm: sh
    psr : 0000101008526030 ifs : 8000000000000fa4 ip : [] Not tainted (3.6.0-rc1)
    ip is at offline_pages+0x210/0xee0
    Call Trace:
    show_stack+0x80/0xa0
    show_regs+0x640/0x920
    die+0x190/0x2c0
    die_if_kernel+0x50/0x80
    ia64_bad_break+0x3d0/0x6e0
    ia64_native_leave_kernel+0x0/0x270
    offline_pages+0x210/0xee0
    alloc_pages_current+0x180/0x2a0

    Signed-off-by: Jianguo Wu
    Signed-off-by: Jiang Liu
    Cc: "Luck, Tony"
    Reviewed-by: Michal Hocko
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jianguo Wu
     
  • If kthread_run() fails, pgdat->kswapd contains errno. When we stop this
    thread, we only check whether pgdat->kswapd is NULL and access it. If
    it contains errno, it will cause page fault. Reset pgdat->kswapd to
    NULL when creating kernel thread fails can avoid this problem.

    Signed-off-by: Wen Congyang
    Reviewed-by: Minchan Kim
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wen Congyang
     
  • The unregister_sysctl_table() function hangs if all references to its
    ctl_table_header structure are not dropped.

    This can happen sometimes because of a leak in proc_sys_lookup():
    proc_sys_lookup() gets a reference to the table via lookup_entry(), but
    it does not release it when a subsequent call to sysctl_follow_link()
    fails.

    This patch fixes this leak by making sure the reference is always
    dropped on return.

    See also commit 076c3eed2c31 ("sysctl: Rewrite proc_sys_lookup
    introducing find_entry and lookup_entry") which reorganized this code in
    3.4.

    Tested in Linux 3.4.4.

    Signed-off-by: Francesco Ruggeri
    Cc: stable@vger.kernel.org
    Signed-off-by: Linus Torvalds

    Francesco Ruggeri
     

17 Sep, 2012

8 commits

  • Linus Torvalds
     
  • Pull mfd fixes from Samuel Ortiz:
    "This is the remaining MFD fixes for 3.6, with 5 pending fixes:

    - A tps65217 build error fix.
    - A lcp_ich regression fix caused by the MFD driver failing to
    initialize the watchdog sub device due to ACPI conflicts.
    - 2 MAX77693 interrupt handling bug fixes.
    - An MFD core fix, adding an IRQ domain argument to the MFD device
    addition API in order to prevent silent and potentially harmful
    remapping behaviour changes for drivers supporting non-DT
    platforms."

    * tag 'mfd-for-linus-3.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
    mfd: MAX77693: Fix NULL pointer error when initializing irqs
    mfd: MAX77693: Fix interrupt handling bug
    mfd: core: Push irqdomain mapping out into devices
    mfd: lpc_ich: Fix a 3.5 kernel regression for iTCO_wdt driver
    mfd: Move tps65217 regulator plat data handling to regulator

    Linus Torvalds
     
  • Pull pwm fixes from Thierry Reding:
    "While this comes a bit later than I had wished, both patches are
    rather minor and touch only new drivers so I think these are still
    safe for merging."

    * tag 'for-3.6-rc6' of git://gitorious.org/linux-pwm/linux-pwm:
    pwm: pwm-tiehrpwm: Fix conflicting channel period setting
    pwm: pwm-tiecap: Disable APWM mode after configure

    Linus Torvalds
     
  • Pull scsi target fixes from Nicholas Bellinger:
    "Here is the current set of target-pending fixes headed for v3.6-final

    The main parts of this series include bug-fixes from Paolo Bonzini to
    address an use-after-free bug in pSCSI sense exception handling, along
    with addressing some long-standing bugs wrt the handling of zero-
    length SCSI CDB payloads also specific to pSCSI pass-through device
    backends."

    * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
    target: go through normal processing for zero-length REQUEST_SENSE
    target: support zero allocation length in REQUEST SENSE
    target: support zero-size allocation lengths in transport_kmap_data_sg
    target: fail REPORT LUNS with less than 16 bytes of payload
    target: report too-small parameter lists everywhere
    target: go through normal processing for zero-length PSCSI commands
    target: fix use-after-free with PSCSI sense data
    target: simplify code around transport_get_sense_data
    target: move transport_get_sense_data
    target: Check idr_get_new return value in iscsi_login_zero_tsih_s1
    target: Fix ->data_length re-assignment bug with SCSI overflow

    Linus Torvalds
     
  • Pull power management fixes from Rafael J. Wysocki:
    "Three ACPI device power management fixes related to checking and
    setting device power states."

    * tag 'pm-for-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
    ACPI / PM: Use KERN_DEBUG when no power resources are found
    ACPI / PM: Fix resource_lock dead lock in acpi_power_on_device
    ACPI / PM: Infer parent power state from child if unknown, v2

    Linus Torvalds
     
  • Pull a btrfs revert from Chris Mason:
    "My for-linus branch has one revert in the new quota code.

    We're building up more fixes at etc for the next merge window, but I'm
    keeping them out unless they are bigger regressions or have a huge
    impact."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
    Revert "Btrfs: fix some error codes in btrfs_qgroup_inherit()"

    Linus Torvalds
     
  • Pull more sound fixes from Takashi Iwai:
    "Yet more (a bunch of) small fixes that slipped from the previous pull
    request. Most of commits are pending ASoC fixes, all of which are
    fairly trivial commits."

    * tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ASoC: wm8904: correct the index
    ALSA: hda - Yet another position_fix quirk for ASUS machines
    ASoC: tegra: fix maxburst settings in dmaengine code
    ASoC: samsung dma - Don't indicate support for pause/resume.
    ASoC: mc13783: Remove mono support
    ASoC: arizona: Fix typo in 44.1kHz rates
    ASoC: spear: correct the check for NULL dma_buffer pointer
    sound: tegra_alc5632: remove HP detect GPIO inversion
    ASoC: atmel-ssc: include linux/io.h for raw io
    ASoC: dapm: Don't force card bias level to be updated
    ASoC: dapm: Make sure we update the bias level for CODECs with no op
    ASoC: am3517evm: fix error return code
    ASoC: ux500_msp_i2s: better use devm functions and fix error return code
    ASoC: imx-sgtl5000: fix error return code

    Linus Torvalds
     
  • This reverts commit 970e178985cadbca660feb02f4d2ee3a09f7fdda.

    Nikolay Ulyanitsky reported thatthe 3.6-rc5 kernel has a 15-20%
    performance drop on PostgreSQL 9.2 on his machine (running "pgbench").

    Borislav Petkov was able to reproduce this, and bisected it to this
    commit 970e178985ca ("sched: Improve scalability via 'CPU buddies' ...")
    apparently because the new single-idle-buddy model simply doesn't find
    idle CPU's to reschedule on aggressively enough.

    Mike Galbraith suspects that it is likely due to the user-mode spinlocks
    in PostgreSQL not reacting well to preemption, but we don't really know
    the details - I'll just revert the commit for now.

    There are hopefully other approaches to improve scheduler scalability
    without it causing these kinds of downsides.

    Reported-by: Nikolay Ulyanitsky
    Bisected-by: Borislav Petkov
    Acked-by: Mike Galbraith
    Cc: Andrew Morton
    Cc: Thomas Gleixner
    Cc: Ingo Molnar
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

16 Sep, 2012

3 commits

  • This patch initialize register map of MUIC device because mfd driver
    of Maxim MAX77693 use regmap-muic instance of MUIC device when irqs of
    Maxim MAX77693 is initialized before call max77693-muic probe() function.

    Signed-off-by: Chanwoo Choi
    Signed-off-by: Myungjoo Ham
    Signed-off-by: Kyungmin Park
    Reported-by: Sylwester Nawrocki
    Acked-by: Greg Kroah-Hartman
    Signed-off-by: Samuel Ortiz

    Chanwoo Choi
     
  • This patch fix bug related to interrupt handling for MAX77693 devices.
    - Unmask interrupt masking bit for charger/flash/muic to revolve
    that interrupt isn't happened when external connector is attached.
    - Fix wrong regmap instance when muic interrupt is happened.

    This patch were discussed and confirm discussion about this patch on below url:
    http://lkml.org/lkml/2012/7/16/118

    Signed-off-by: Chanwoo Choi
    Signed-off-by: Myungjoo Ham
    Signed-off-by: Kyungmin Park
    Acked-by: Greg Kroah-Hartman
    Signed-off-by: Samuel Ortiz

    Chanwoo Choi
     
  • Currently the MFD core supports remapping MFD cell interrupts using an
    irqdomain but only if the MFD is being instantiated using device tree
    and only if the device tree bindings use the pattern of registering IPs
    in the device tree with compatible properties. This will be actively
    harmful for drivers which support non-DT platforms and use this pattern
    for their DT bindings as it will mean that the core will silently change
    remapping behaviour and it is also limiting for drivers which don't do
    DT with this particular pattern. There is also a potential fragility if
    there are interrupts not associated with MFD cells and all the cells are
    omitted from the device tree for some reason.

    Instead change the code to take an IRQ domain as an optional argument,
    allowing drivers to take the decision about the parent domain for their
    interrupts. The one current user of this feature is ab8500-core, it has
    the domain lookup pushed out into the driver.

    Signed-off-by: Mark Brown
    Signed-off-by: Samuel Ortiz

    Mark Brown
     

15 Sep, 2012

17 commits

  • ASoC: Updates for 3.6

    A bigger set of updates than I'm entirely comfortable with - things
    backed up a bit due to travel. As ever the majority of these are small,
    focused updates for specific drivers though there are a couple of core
    changes. There's been good exposure in -next.

    The AT91 patch fixes a build break.

    Takashi Iwai
     
  • Pull GFS2 fixes from Steven Whitehouse:
    "Here are three GFS2 fixes for the current kernel tree. These are all
    related to the block reservation code which was added at the merge
    window. That code will be getting an update at the forthcoming merge
    window too. In the mean time though there are a few smaller issues
    which should be fixed.

    The first patch resolves an issue with write sizes of greater than 32
    bits with the size hinting code. The second ensures that the
    allocation data structure is initialised when using xattrs and the
    third takes into account allocations which may have been made by other
    nodes which affect a reservation on the local node."

    * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
    GFS2: Take account of blockages when using reserved blocks
    GFS2: Fix missing allocation data for set/remove xattr
    GFS2: Make write size hinting code common

    Linus Torvalds
     
  • Pull x86 platform driver updates from Matthew Garrett:
    "A few small updates for 3.6 - a trivial regression fix and a couple of
    conformance updates for the gmux driver, plus some tiny fixes for
    asus-wmi, eeepc-laptop and thinkpad_acpi."

    * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
    thinkpad_acpi: buffer overflow in fan_get_status()
    eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug()
    platform/x86: fix asus_laptop.wled_type description
    asus-laptop: HRWS/HWRS typo
    drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO
    apple-gmux: Fix port address calculation in gmux_pio_write32()
    apple-gmux: Fix index read functions
    apple-gmux: Obtain version info from indexed gmux

    Linus Torvalds
     
  • Pull i2c embedded fixes from Wolfram Sang:
    "The last bunch of (typical) i2c-embedded driver fixes for 3.6.

    Also update the MAINTAINERS file to point to my tree since people keep
    asking where to find their patches."

    * 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
    i2c: algo: pca: Fix mode selection for PCA9665
    MAINTAINERS: fix tree for current i2c-embedded development
    i2c: mxs: correctly setup speed for non devicetree
    i2c: pnx: Fix read transactions of >= 2 bytes
    i2c: pnx: Fix bit definitions

    Linus Torvalds
     
  • Pull ecryptfs fixes from Tyler Hicks:

    - Fixes a regression, introduced in 3.6-rc1, when a file is closed
    before its shared memory mapping is dirtied and unmapped. The lower
    file was being released when the eCryptfs file was closed and the
    dirtied pages could not be written out.
    - Adds a call to the lower filesystem's ->flush() from
    ecryptfs_flush().
    - Fixes a regression, introduced in 2.6.39, when a file is renamed on
    top of another file. The target file's inode was not being evicted
    and the space taken by the file was not reclaimed until eCryptfs was
    unmounted.

    * tag 'ecryptfs-3.6-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
    eCryptfs: Copy up attributes of the lower target inode after rename
    eCryptfs: Call lower ->flush() from ecryptfs_flush()
    eCryptfs: Write out all dirty pages just before releasing the lower file

    Linus Torvalds
     
  • Pull one more DMA-mapping fix from Marek Szyprowski:
    "This patch fixes very subtle bug (typical off-by-one error) which
    might appear in very rare circumstances."

    * 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
    arm: mm: fix DMA pool affiliation check

    Linus Torvalds
     
  • Pull hwmon fixes from Guenter Roeck:
    "Fix word size register read and write operations in ina2xx driver, and
    initialize uninitialized structure elements in twl4030-madc-hwmon
    driver."

    * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
    hwmon: (ina2xx) Fix word size register read and write operations
    hwmon: (twl4030-madc-hwmon) Initialize uninitialized structure elements

    Linus Torvalds
     
  • Pull drm fixes from Dave Airlie:
    "I realise this a bit bigger than I would want at this point.

    Exynos is a large chunk, I got them to half what they wanted already,
    and hey its ARM based, so not going to hurt many people.

    Radeon has only two fixes, but the PLL fixes were a bit bigger, but
    required for a lot of scenarios, the fence fix is really urgent.

    vmwgfx: I've pulled in a dumb ioctl support patch that I was going to
    shove in later and cc stable, but we need it asap, its mainly to stop
    mesa growing a really ugly dependency in userspace to run stuff on
    vmware, and if I don't stick it in the kernel now, everyone will have
    to ship ugly userspace libs to workaround it.

    nouveau: single urgent fix found in F18 testing, causes X to not start
    properly when f18 plymouth is used

    i915: smattering of fixes and debug quieting

    gma500: single regression fix

    So as I said a bit large, but its fairly well scattered and its all
    stuff I'll be shipping in F18's 3.6 kernel."

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (26 commits)
    drm/nouveau: fix booting with plymouth + dumb support
    drm/radeon: make 64bit fences more robust v3
    drm/radeon: rework pll selection (v3)
    drm: Drop the NV12M and YUV420M formats
    drm/exynos: remove DRM_FORMAT_NV12M from plane module
    drm/exynos: fix double call of drm_prime_(init/destroy)_file_private
    drm/exynos: add dummy support for dmabuf-mmap
    drm/exynos: Add missing braces around sizeof in exynos_mixer.c
    drm/exynos: Add missing braces around sizeof in exynos_hdmi.c
    drm/exynos: Make g2d_pm_ops static
    drm/exynos: Add dependency for G2D in Kconfig
    drm/exynos: fixed page align bug.
    drm/exynos: Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(.. [1]
    drm/exynos: Use devm_* functions in exynos_drm_g2d.c file
    drm/exynos: Use devm_kzalloc in exynos_drm_hdmi.c file
    drm/exynos: Use devm_kzalloc in exynos_drm_vidi.c file
    drm/exynos: Remove redundant check in exynos_drm_fimd.c file
    drm/exynos: Remove redundant check in exynos_hdmi.c file
    vmwgfx: add dumb ioctl support
    gma500: Fix regression on Oaktrail devices
    ...

    Linus Torvalds
     
  • Pull scheduler fixes from Ingo Molnar:
    "Smaller fixlets"

    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    sched: Fix kernel-doc warnings in kernel/sched/fair.c
    sched: Unthrottle rt runqueues in __disable_runtime()
    sched: Add missing call to calc_load_exit_idle()
    sched: Fix load avg vs cpu-hotplug

    Linus Torvalds
     
  • Pull perf fixes from Ingo Molnar:
    "This tree includes various fixes"

    Ingo really needs to improve on the whole "explain git pull" part.
    "Various fixes" indeed.

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    perf/hwpb: Invoke __perf_event_disable() if interrupts are already disabled
    perf/x86: Enable Intel Cedarview Atom suppport
    perf_event: Switch to internal refcount, fix race with close()
    oprofile, s390: Fix uninitialized memory access when writing to oprofilefs
    perf/x86: Fix microcode revision check for SNB-PEBS

    Linus Torvalds
     
  • Pull a core sparse warning fix from Ingo Molnar

    * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    mm/memblock: Use NULL instead of 0 for pointers

    Linus Torvalds
     
  • This reverts commit 5986802c2fcc754040bb7ed95f30bb16c4a843b7.

    Both paths are not error paths but regular cases where non-qgroup
    subvols are involved.

    Signed-off-by: Chris Mason

    Chris Mason
     
  • Pull networking fixes from David Miller:

    1) Use after free and new device IDs in bluetooth from Andre Guedes,
    Yevgeniy Melnichuk, Gustavo Padovan, and Henrik Rydberg.

    2) Fix crashes with short packet lengths and VLAN in pktgen, from
    Nishank Trivedi.

    3) mISDN calls flush_work_sync() with locks held, fix from Karsten
    Keil.

    4) Packet scheduler gred parameters are reported to userspace
    improperly scaled, and WRED idling is not performed correctly. All
    from David Ward.

    5) Fix TCP socket refcount problem in ipv6, from Julian Anastasov.

    6) ibmveth device has RX queue alignment requirements which are not
    being explicitly met resulting in sporadic failures, fix from
    Santiago Leon.

    7) Netfilter needs to take care when interpreting sockets attached to
    socket buffers, they could be time-wait minisockets. Fix from Eric
    Dumazet.

    8) sock_edemux() has the same issue as netfilter did in #7 above, fix
    from Eric Dumazet.

    9) Avoid infinite loops in CBQ scheduler with some configurations, from
    Eric Dumazet.

    10) Deal with "Reflection scan: an Off-Path Attack on TCP", from Jozsef
    Kadlecsik.

    11) SCTP overcharges socket for TX packets, fix from Thomas Graf.

    12) CODEL packet scheduler should not reset it's state every time it
    builds a new flow, fix from Eric Dumazet.

    13) Fix memory leak in nl80211, from Wei Yongjun.

    14) NETROM doesn't check skb_copy_datagram_iovec() return values, from
    Alan Cox.

    15) l2tp ethernet was using sizeof(ETH_HLEN) instead of plain ETH_HLEN,
    oops. From Eric Dumazet.

    16) Fix selection of ath9k chips on which PA linearization and AM2PM
    predistoration are used, from Felix Fietkau.

    17) Flow steering settings in mlx4 driver need to be validated properly,
    from Hadar Hen Zion.

    18) bnx2x doesn't show the correct link duplex setting, from Yaniv
    Rosner.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (75 commits)
    pktgen: fix crash with vlan and packet size less than 46
    bnx2x: Add missing afex code
    bnx2x: fix registers dumped
    bnx2x: correct advertisement of pause capabilities
    bnx2x: display the correct duplex value
    bnx2x: prevent timeouts when using PFC
    bnx2x: fix stats copying logic
    bnx2x: Avoid sending multiple statistics queries
    net: qmi_wwan: call subdriver with control intf only
    net_sched: gred: actually perform idling in WRED mode
    net_sched: gred: fix qave reporting via netlink
    net_sched: gred: eliminate redundant DP prio comparisons
    net_sched: gred: correct comment about qavg calculation in RIO mode
    mISDN: Fix wrong usage of flush_work_sync while holding locks
    netfilter: log: Fix log-level processing
    net-sched: sch_cbq: avoid infinite loop
    net: qmi_wwan: fix Gobi device probing for un2430
    net: fix net/core/sock.c build error
    ixp4xx_hss: fix build failure due to missing linux/module.h inclusion
    caif: move the dereference below the NULL test
    ...

    Linus Torvalds
     
  • Pull USB patches from Greg Kroah-Hartman:
    "Here are a number of USB patches, a bit more than I normally like this
    late in the -rc series, but given people's vacations (myself
    included), and the kernel summit, it seems to have happened this way.

    All are tiny, but they add up. A number of gadget and xhci fixes, and
    a few new device ids. All have been tested in linux-next.

    Signed-off-by: Greg Kroah-Hartman "

    * tag 'usb-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (33 commits)
    usb: chipidea: udc: don't stall endpoint if request list is empty in isr_tr_complete_low
    usb: chipidea: cleanup dma_pool if udc_start() fails
    usb: chipidea: udc: fix error path in udc_start()
    usb: chipidea: udc: add pullup fuction, needed by the uvc gadget
    usb: chipidea: udc: fix setup of endpoint maxpacket size
    USB: option: replace ZTE K5006-Z entry with vendor class rule
    EHCI: Update qTD next pointer in QH overlay region during unlink
    USB: cdc-wdm: fix wdm_find_device* return value
    USB: ftdi_sio: do not claim CDC ACM function
    usb: dwc3: gadget: fix pending isoc handling
    usb: renesas_usbhs: fixup DMA transport data alignment
    usb: gadget: at91udc: Don't check for ep->ep.desc
    usb: gadget: at91udc: don't overwrite driver data
    usb: dwc3: core: fix incorrect usage of resource pointer
    usb: musb: musbhsdma: fix IRQ check
    usb: musb: tusb6010: fix error path in tusb_probe()
    usb: musb: host: fix for musb_start_urb Oops
    usb: gadget: dummy_hcd: add support for USB_DT_BOS on rh
    usb: gadget: dummy_hcd: fixup error probe path
    usb: gadget: s3c-hsotg.c: fix error return code
    ...

    Linus Torvalds
     
  • Pull TTY fixes from Greg Kroah-Hartman:
    "Here are 2 tiny patches for a serial driver to resolve issues that
    people have reported with the 3.6-rc tree.

    Both of these have been in the linux-next tree for a while now.

    Signed-off-by: Greg Kroah-Hartman "

    * tag 'tty-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
    tty: serial: imx: don't reinit clock in imx_setup_ufcr()
    tty: serial: imx: console write routing is unsafe on SMP

    Linus Torvalds
     
  • Pull staging tree fixes from Greg Kroah-Hartman:
    "Here are a few staging tree fixes for problems that have been
    reported.

    Nothing major, just a number of tiny driver fixes. All of these have
    been in the linux-next tree for a while.

    Signed-off-by: Greg Kroah-Hartman "

    * tag 'staging-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
    drm/omap: add more new timings fields
    drm/omap: update for interlaced
    staging: r8712u: fix bug in r8712_recv_indicatepkt()
    staging: zcache: fix cleancache race condition with shrinker
    Staging: Android alarm: IOCTL command encoding fix
    staging: vt6656: [BUG] - Failed connection, incorrect endian.
    staging: ozwpan: fix memcmp() test in oz_set_active_pd()
    staging: wlan-ng: Fix problem with wrong arguments
    staging: comedi: das08: Correct AO output for das08jr-16-ao
    staging: comedi: das08: Correct AI encoding for das08jr-16-ao
    staging: comedi: das08: Fix PCI ref count
    staging: comedi: amplc_pci230: Fix PCI ref count
    staging: comedi: amplc_pc263: Fix PCI ref count
    staging: comedi: amplc_pc236: Fix PCI ref count
    staging: comedi: amplc_dio200: Fix PCI ref count
    staging: comedi: amplc_pci224: Fix PCI ref count
    drivers/iio/adc/at91_adc.c: adjust inconsistent IS_ERR and PTR_ERR
    staging iio: fix potential memory leak in lis3l02dq_ring.c
    staging:iio: prevent divide by zero bugs

    Linus Torvalds
     
  • Pull driver core fix from Greg Kroah-Hartman:
    "Here is one fix for 3.6-rc6 for the kobject.h file.

    It fixes a reported oops if CONFIG_HOTPLUG is disabled. It's been in
    the linux-next tree for a while now.

    Signed-off-by: Greg Kroah-Hartman "

    * tag 'driver-core-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
    kobject: fix oops with "input0: bad kobj_uevent_env content in show_uevent()"

    Linus Torvalds