14 Jul, 2012

2 commits

  • Pull media fixes from Mauro Carvalho Chehab:
    - Some regression fixes at the audio part for devices with
    cx23885/cx25840
    - A DMA corruption fix at cx231xx
    - two fixes at the winbond IR driver
    - Several fixes for the EXYNOS media driver (s5p)
    - two fixes at the OMAP3 preview driver
    - one fix at the dvb core failure path
    - an include missing (slab.h) at smiapp-core causing compilation
    breakage
    - em28xx was not loading the IR driver driver anymore.

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (31 commits)
    [media] Revert "[media] V4L: JPEG class documentation corrections"
    [media] s5p-fimc: Add missing FIMC-LITE file operations locking
    [media] omap3isp: preview: Fix contrast and brightness handling
    [media] omap3isp: preview: Fix output size computation depending on input format
    [media] winbond-cir: Initialise timeout, driver_type and allowed_protos
    [media] winbond-cir: Fix txandrx module info
    [media] cx23885: Silence unknown command warnings
    [media] cx23885: add support for HVR-1255 analog (cx23888 variant)
    [media] cx23885: make analog support work for HVR_1250 (cx23885 variant)
    [media] cx25840: fix vsrc/hsrc usage on cx23888 designs
    [media] cx25840: fix regression in HVR-1800 analog audio
    [media] cx25840: fix regression in analog support hue/saturation controls
    [media] cx25840: fix regression in HVR-1800 analog support
    [media] s5p-mfc: Fixed setup of custom controls in decoder and encoder
    [media] cx231xx: don't DMA to random addresses
    [media] em28xx: fix em28xx-rc load
    [media] dvb-core: Release semaphore on error path dvb_register_device()
    [media] s5p-fimc: Stop media entity pipeline if fimc_pipeline_validate fails
    [media] s5p-fimc: Fix compiler warning in fimc-lite.c
    [media] s5p-fimc: media_entity_pipeline_start() may fail
    ...

    Linus Torvalds
     
  • Pull late MTD fixes from David Woodhouse:
    - fix 'sparse warning fix' regression which totally breaks MXC NAND
    - fix GPMI NAND regression when used with UBI
    - update/correct sysfs documentation for new 'bitflip_threshold' field
    - fix nandsim build failure

    * tag 'for-linus-20120712' of git://git.infradead.org/linux-mtd:
    mtd: nandsim: don't open code a do_div helper
    mtd: ABI documentation: clarification of bitflip_threshold
    mtd: gpmi-nand: fix read page when reading to vmalloced area
    mtd: mxc_nand: use 32bit copy functions

    Linus Torvalds
     

07 Jul, 2012

2 commits


06 Jul, 2012

3 commits

  • The -EUCLEAN return value applies to mtd_read_oob() as well as mtd_read(), but
    only mtd_read() was mentioned in the blurd on bitflip_threshold in the ABI
    documentation.

    Signed-off-by: Mike Dunn
    Signed-off-by: Artem Bityutskiy
    Signed-off-by: David Woodhouse

    Mike Dunn
     
  • Pull KVM fix from Marcelo Tosatti:
    "Memory leak and oops on the x86 mmu code, and sanitization of the
    KVM_IRQFD ioctl."

    * git://git.kernel.org/pub/scm/virt/kvm/kvm:
    KVM: MMU: fix shrinking page from the empty mmu
    KVM: fix fault page leak
    KVM: Sanitize KVM_IRQFD flags
    KVM: Add missing KVM_IRQFD API documentation
    KVM: Pass kvm_irqfd to functions

    Linus Torvalds
     
  • Pull DT fixes from Rob Herring:
    "Mainly some documentation updates and 2 fixes:

    - An export symbol fix for of_platform_populate from Stephen W.
    - A fix for the order compatible entries are matched to ensure the
    first compatible string is matched when there are multiple matches."

    Normally these would go through Grant Likely (thus the "fixes-for-grant"
    branch name), but Grant is in the middle of moving to Scotland, and is
    practically offline until sometime in August. So pull directly from Rob.

    * 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux:
    of: match by compatible property first
    dt: mc13xxx.txt: Fix gpio number assignment
    dt: fsl-fec.txt: Fix gpio number assignment
    dt: fsl-mma8450.txt: Add missing 'reg' description
    dt: fsl-imx-esdhc.txt: Fix gpio number assignment
    dt: fsl-imx-cspi.txt: Fix comment about GPIOs used for chip selects
    of: Add Avionic Design vendor prefix
    of: export of_platform_populate()

    Linus Torvalds
     

04 Jul, 2012

2 commits

  • Pull block bits from Jens Axboe:
    "As vacation is coming up, thought I'd better get rid of my pending
    changes in my for-linus branch for this iteration. It contains:

    - Two patches for mtip32xx. Killing a non-compliant sysfs interface
    and moving it to debugfs, where it belongs.

    - A few patches from Asias. Two legit bug fixes, and one killing an
    interface that is no longer in use.

    - A patch from Jan, making the annoying partition ioctl warning a bit
    less annoying, by restricting it to !CAP_SYS_RAWIO only.

    - Three bug fixes for drbd from Lars Ellenberg.

    - A fix for an old regression for umem, it hasn't really worked since
    the plugging scheme was changed in 3.0.

    - A few fixes from Tejun.

    - A splice fix from Eric Dumazet, fixing an issue with pipe
    resizing."

    * 'for-linus' of git://git.kernel.dk/linux-block:
    scsi: Silence unnecessary warnings about ioctl to partition
    block: Drop dead function blk_abort_queue()
    block: Mitigate lock unbalance caused by lock switching
    block: Avoid missed wakeup in request waitqueue
    umem: fix up unplugging
    splice: fix racy pipe->buffers uses
    drbd: fix null pointer dereference with on-congestion policy when diskless
    drbd: fix list corruption by failing but already aborted reads
    drbd: fix access of unallocated pages and kernel panic
    xen/blkfront: Add WARN to deal with misbehaving backends.
    blkcg: drop local variable @q from blkg_destroy()
    mtip32xx: Create debugfs entries for troubleshooting
    mtip32xx: Remove 'registers' and 'flags' from sysfs
    blkcg: fix blkg_alloc() failure path
    block: blkcg_policy_cfq shouldn't be used if !CONFIG_CFQ_GROUP_IOSCHED
    block: fix return value on cfq_init() failure
    mtip32xx: Remove version.h header file inclusion
    xen/blkback: Copy id field when doing BLKIF_DISCARD.

    Linus Torvalds
     
  • Pull device-mapper fixes from Alasdair G Kergon:
    "Four minor thin provisioning fixes and correct and update dm-verity
    documentation."

    * tag 'dm-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm:
    dm: verity fix documentation
    dm persistent data: fix allocation failure in space map checker init
    dm persistent data: handle space map checker creation failure
    dm persistent data: fix shadow_info_leak on dm_tm_destroy
    dm thin: commit metadata before creating metadata snapshot

    Linus Torvalds
     

03 Jul, 2012

3 commits


01 Jul, 2012

1 commit

  • Pull driver Core fixes from Greg Kroah-Hartman:
    "Here is a number of printk() fixes, specifically a few reported by the
    crazy blog program that ships in SUSE releases (that's "boot log" and
    not "web log", it predates the general "blog" terminology by many
    years), and the restoration of the continuation line functionality
    reported by Stephen and others. Yes, the changes seem a bit big this
    late in the cycle, but I've been beating on them for a while now, and
    Stephen has even optimized it a bit, so all looks good to me.

    The other change in here is a Documentation update for the stable
    kernel rules describing how some distro patches should be backported,
    to hopefully drive a bit more response from the distros to the stable
    kernel releases.

    Signed-off-by: Greg Kroah-Hartman "

    * tag 'driver-core-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
    printk: Optimize if statement logic where newline exists
    printk: flush continuation lines immediately to console
    syslog: fill buffer with more than a single message for SYSLOG_ACTION_READ
    Revert "printk: return -EINVAL if the message len is bigger than the buf size"
    printk: fix regression in SYSLOG_ACTION_CLEAR
    stable: Allow merging of backports for serious user-visible performance issues

    Linus Torvalds
     

26 Jun, 2012

2 commits

  • Pull media fixes from Mauro Carvalho Chehab.

    Trivial conflict due to new USB HID ID's being added next to each other
    (Baanto vs Axentia).

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits)
    [media] smia: Fix compile failures
    [media] Fix VIDIOC_DQEVENT docbook entry
    [media] s5p-fimc: Fix control creation function
    [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file
    [media] s5p-mfc: Fix setting controls
    [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT
    [media] v4l/s5p-mfc: corrected encoder v4l control definitions
    [media] v4l: mem2mem_testdev: Fix race conditions in driver
    [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism
    [media] cxd2820r: Fix an incorrect modulation type bitmask
    [media] em28xx: Show a warning if the board does not support remote controls
    [media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD
    [media] USB: Staging: media: lirc: initialize spinlocks before usage
    [media] Revert "[media] media: mx2_camera: Fix mbus format handling"
    [media] bw-qcam: driver and pixfmt documentation fixes
    [media] cx88: fix firmware load on big-endian systems
    [media] cx18: support big-endian systems
    [media] ivtv: fix support for big-endian systems
    [media] tuner-core: return the frequency range of the correct tuner
    [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls()
    ...

    Linus Torvalds
     
  • Distribution kernel maintainers routinely backport fixes for users that
    were deemed important but not "something critical" as defined by the
    rules. To users of these kernels they are very serious and failing to fix
    them reduces the value of -stable.

    The problem is that the patches fixing these issues are often subtle and
    prone to regressions in other ways and need greater care and attention.
    To combat this, these "serious" backports should have a higher barrier
    to entry.

    This patch relaxes the rules to allow a distribution maintainer to merge
    to -stable a backported patch or small series that fixes a "serious"
    user-visible performance issue. They should include additional information on
    the user-visible bug affected and a link to the bugzilla entry if available.
    The same rules about the patch being already in mainline still apply.

    Signed-off-by: Mel Gorman
    Cc: stable
    Signed-off-by: Greg Kroah-Hartman

    Mel Gorman
     

21 Jun, 2012

3 commits

  • Pull staging tree fixes from Greg Kroah-Hartman:
    "Here are a number of small fixes for the drivers/staging tree, as well
    as iio and pstore drivers (which came from the staging tree in the
    3.5-rc1 merge). All of these are tiny, but resolve issues that people
    have been reporting.

    There's also a documentation update to reflect what the iio drivers
    really are doing, which is good to get straightened out.

    Signed-off-by: Greg Kroah-Hartman "

    * tag 'staging-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
    staging: r8712u: Add new USB IDs
    staging: gdm72xx: Release netlink socket properly
    iio: drop wrong reference from Kconfig
    pstore/inode: Make pstore_fill_super() static
    pstore/ram: Should zap persistent zone on unlink
    pstore/ram_core: Factor persistent_ram_zap() out of post_init()
    pstore/ram_core: Do not reset restored zone's position and size
    pstore/ram: Should update old dmesg buffer before reading
    staging:iio:ad7298: Fix linker error due to missing IIO kfifo buffer
    Revert "staging: usbip: bugfix for stack corruption on 64-bit architectures"
    staging: usbip: bugfix for stack corruption on 64-bit architectures
    staging/comedi: fix build for USB not enabled
    staging: omapdrm: fix crash when freeing bad fb
    staging:iio:ad7606: Re-add missing scale attribute
    iio: Fix potential use after free
    staging:iio: remove num_interrupt_lines from documentation
    iio: documentation: Add out_altvoltage and friends

    Linus Torvalds
     
  • * emailed from Andrew Morton : (21 patches)
    mm/memblock: fix overlapping allocation when doubling reserved array
    c/r: prctl: Move PR_GET_TID_ADDRESS to a proper place
    pidns: find_new_reaper() can no longer switch to init_pid_ns.child_reaper
    pidns: guarantee that the pidns init will be the last pidns process reaped
    fault-inject: avoid call to random32() if fault injection is disabled
    Viresh has moved
    get_maintainer: Fix --help warning
    mm/memory.c: fix kernel-doc warnings
    mm: fix kernel-doc warnings
    mm: correctly synchronize rss-counters at exit/exec
    mm, thp: print useful information when mmap_sem is unlocked in zap_pmd_range
    h8300: use the declarations provided by
    h8300: fix use of extinct _sbss and _ebss
    xtensa: use the declarations provided by
    xtensa: use "test -e" instead of bashism "test -a"
    xtensa: replace xtensa-specific _f{data,text} by _s{data,text}
    memcg: fix use_hierarchy css_is_ancestor oops regression
    mm, oom: fix and cleanup oom score calculations
    nilfs2: ensure proper cache clearing for gc-inodes
    thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE
    ...

    Linus Torvalds
     
  • viresh.kumar@st.com email-id doesn't exist anymore as I have left the
    company. Replace ST's id with viresh.linux@gmail.com.

    It also updates .mailmap file to fix address for 'git shortlog'

    Signed-off-by: Viresh Kumar
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Viresh Kumar
     

19 Jun, 2012

1 commit


18 Jun, 2012

3 commits


14 Jun, 2012

7 commits

  • Pull networking fixes from David S. Miller:

    This has the fix for the wireless issues I ran into the other week as
    well as:

    1) Fix CAN c_can driver transmit handling resulting in BUG check
    triggers, from AnilKumar Ch.

    2) Fix packet drop monitor sleeping in atomic context, from Eric
    Dumazet.

    3) Fix mv643xx_eth driver build regression, from Andrew Lunn.

    4) Inetpeer freeing needs an RCU grace period in order to avoid races
    during tree invalidation. From Eric Dumazet.

    5) Fix endianness bugs in xt_HMARK netfilter module, from Hans
    Schillstrom.

    6) Add proper module refcounting to l2tp_eth to avoid crash on module
    unload, from Eric Dumazet.

    7) Fix truncation of neighbour entry dumps due to logic errors in
    neigh_dump_info() and friends, from Eric Dumazet.

    8) The conversion of fib6_age() to dst_neigh_lookup() accidently
    reversed the logic of a flags test, fix from Thomas Graf.

    9) Fix checksum configuration in newer sky2 chips, from Stephen
    Hemminger.

    10) Revert BQL support in NIU driver, doesn't work.

    11) l2tp_ip_sendmsg() illegally uses a route without a proper reference.
    From Eric Dumazet.

    12) be2net driver references an SKB after it's potentially been freed,
    also from Eric Dumazet.

    13) Fix RCU stalls in dummy net driver init. Also from Eric Dumazet.

    14) lpc_eth has several bugs in it's transmit engine leading to packet
    leaks and improper queue wakes, from Eric Dumazet.

    15) Apply short DMA workaround to more tg3 chips, from Matt Carlson.

    16) Add tilegx network driver.

    17) Bonding queue mapping for a packet can get corrupted, fix from Eric
    Dumazet.

    18) Fix bug in netpoll_send_udp() SKB management that can leave garbage
    in the payload in certain situations. From Eric Dumazet.

    19) bnx2x driver interprets chip RX checksum offload incorrectly in
    encapsulation situations. Fix from Eric Dumazet.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (75 commits)
    bnx2x: fix checksum validation
    netpoll: fix netpoll_send_udp() bugs
    bonding: Fix corrupted queue_mapping
    bonding:record primary when modify it via sysfs
    tilegx network driver: initial support
    tg3: Apply short DMA frag workaround to 5906
    net: stmmac: Fix clock en-/disable calls
    lpc_eth: fix tx completion
    lpc_eth: add missing ndo_change_mtu()
    dummy: fix rcu_sched self-detected stalls
    net: Reorder initialization in ip_route_output to fix gcc warning
    virtio-net: fix a race on 32bit arches
    r8169: avoid NAPI scheduling delay.
    net: Make linux/tcp.h C++ friendly (trivial)
    netdev: fix drivers/net/phy/ kernel-doc warnings
    net/core: fix kernel-doc warnings
    be2net: fix a race in be_xmit()
    l2tp: fix a race in l2tp_ip_sendmsg()
    mac80211: add back channel change flag
    NFC: Fix possible NULL ptr deref when getting the name of a socket
    ...

    Linus Torvalds
     
  • Fix gpio number assignment, so that it can match the number stated in the comment.

    Signed-off-by: Fabio Estevam
    Signed-off-by: Rob Herring

    Fabio Estevam
     
  • Fix gpio number assignment, so that it can match the number stated in the comment.

    Signed-off-by: Fabio Estevam
    Signed-off-by: Rob Herring

    Fabio Estevam
     
  • Add missing 'reg' description.

    Signed-off-by: Fabio Estevam
    ----
    .../devicetree/bindings/input/fsl-mma8450.txt | 1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
    Signed-off-by: Rob Herring

    Fabio Estevam
     
  • Fix gpio number assignment, so that it can match the number stated in the comment.

    Cc:
    Signed-off-by: Fabio Estevam
    Signed-off-by: Rob Herring

    Fabio Estevam
     
  • The gpio numbers does not match the comment.

    Fix the comments for GPIOs used for chip selects.

    Signed-off-by: Fabio Estevam
    Signed-off-by: Rob Herring

    Fabio Estevam
     
  • This commit adds a device tree vendor prefix for Avionic Design GmbH.

    Cc: Grant Likely
    Cc: Rob Herring
    Cc: devicetree-discuss@lists.ozlabs.org
    Cc: Linus Walleij
    Signed-off-by: Thierry Reding
    Signed-off-by: Rob Herring

    Thierry Reding
     

12 Jun, 2012

3 commits

  • Fix the documentation of the Y4 and Y6 formats.
    Fix a poll() issue, add support for enum_frmsizes, set the proper
    parent device and fix a few compliance issues.

    Tested with an actual Connectix B&W parallel port webcam, both on a
    little-endian and a big-endian platform. This driver has never been
    so good, doing 320x240 at 1 frame per second :-)

    I know, nobody cares, but still it is cool that linux can still support
    this old webcam.

    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     
  • Two small docbook fixes:

    - prepare-buf was not positioned in alphabetical order, moved to the right place.
    - the format field in create_bufs had the wrong type in the documentation

    Signed-off-by: Hans Verkuil
    Reviewed-by: Guennadi Liakhovetski
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     
  • Patch id 6016af82eafcb6e086a8f2a2197b46029a843d68 ("[media] v4l2: use __u32
    rather than enums in ioctl() structs") unintentionally changes the type of
    the format field in struct v4l2_create_buffers from struct v4l2_format to
    __u32. Revert that change.

    Signed-off-by: Sakari Ailus
    Signed-off-by: Mauro Carvalho Chehab

    Sakari Ailus
     

07 Jun, 2012

1 commit


06 Jun, 2012

1 commit

  • Pull embedded i2c update from Wolfram Sang:
    "This only contains one new driver which had multiple dependencies
    (pinctrl, i2c-mux-rework, new devm_* functions), so I decided to wait
    for rc1. Plus, it had to wait a little for the ack of a devicetree
    maintainer since the bindings were not trivial enough for me to pass
    through.

    So, given that, I hope there is still something like the "new driver
    rule", so we could have the driver in 3.5 and people can start using
    it. That would make merging support for some boards easier for 3.6
    since the dependency on this driver is gone then."

    * 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
    i2c: Add generic I2C multiplexer using pinctrl API

    Linus Torvalds
     

05 Jun, 2012

4 commits

  • This patch removes entries 'registers' and 'flags' from sysfs. Updated ABI file
    to reflect this change.

    Reported-by: Greg Kroah-Hartman
    Signed-off-by: Asai Thambi S P
    Signed-off-by: Jens Axboe

    Asai Thambi S P
     
  • Continuous frequency/clock generating devices, such as DDSs or PLLs
    should use out_altvoltage.

    Signed-off-by: Michael Hennerich
    Acked-by: Jonathan Cameron
    Signed-off-by: Greg Kroah-Hartman

    Michael Hennerich
     
  • Pull frontswap feature from Konrad Rzeszutek Wilk:
    "Frontswap provides a "transcendent memory" interface for swap pages.
    In some environments, dramatic performance savings may be obtained
    because swapped pages are saved in RAM (or a RAM-like device) instead
    of a swap disk. This tag provides the basic infrastructure along with
    some changes to the existing backends."

    Fix up trivial conflict in mm/Makefile due to removal of swap token code
    changing a line next to the new frontswap entry.

    This pull request came in before the merge window even opened, it got
    delayed to after the merge window by me just wanting to make sure it had
    actual users. Apparently IBM is using this on their embedded side, and
    Jan Beulich says that it's already made available for SLES and OpenSUSE
    users.

    Also acked by Rik van Riel, and Konrad points to other people liking it
    too. So in it goes.

    By Dan Magenheimer (4) and Konrad Rzeszutek Wilk (2)
    via Konrad Rzeszutek Wilk
    * tag 'stable/frontswap.v16-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:
    frontswap: s/put_page/store/g s/get_page/load
    MAINTAINER: Add myself for the frontswap API
    mm: frontswap: config and doc files
    mm: frontswap: core frontswap functionality
    mm: frontswap: core swap subsystem hooks and headers
    mm: frontswap: add frontswap header file

    Linus Torvalds
     
  • Pull timer updates from Thomas Gleixner:
    "The clocksource driver is pure hardware enablement and the skew option
    is default off, well tested and non dangerous."

    * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    tick: Move skew_tick option into the HIGH_RES_TIMER section
    clocksource: em_sti: Add DT support
    clocksource: em_sti: Emma Mobile STI driver
    clockevents: Make clockevents_config() a global symbol
    tick: Add tick skew boot option

    Linus Torvalds
     

04 Jun, 2012

1 commit

  • This is useful for SoCs whose I2C module's signals can be routed to
    different sets of pins at run-time, using the pinctrl API.

    +-----+ +-----+
    | dev | | dev |
    +------------------------+ +-----+ +-----+
    | SoC | | |
    | /----|------+--------+
    | +---+ +------+ | child bus A, on first set of pins
    | |I2C|---|Pinmux| |
    | +---+ +------+ | child bus B, on second set of pins
    | \----|------+--------+--------+
    | | | | |
    +------------------------+ +-----+ +-----+ +-----+
    | dev | | dev | | dev |
    +-----+ +-----+ +-----+

    Signed-off-by: Stephen Warren
    Acked-by: Linus Walleij
    Acked-by: Rob Herring
    Signed-off-by: Wolfram Sang

    Stephen Warren
     

03 Jun, 2012

1 commit

  • Pull device-mapper updates from Alasdair G Kergon:
    "Improve multipath's retrying mechanism in some defined circumstances
    and provide a simple reserve/release mechanism for userspace tools to
    access thin provisioning metadata while the pool is in use."

    * tag 'dm-3.5-changes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm:
    dm thin: provide userspace access to pool metadata
    dm thin: use slab mempools
    dm mpath: allow ioctls to trigger pg init
    dm mpath: delay retry of bypassed pg
    dm mpath: reduce size of struct multipath

    Linus Torvalds