20 Apr, 2014

1 commit

  • Pull drm fixes from Dave Airlie:
    "Unfortunately this contains no easter eggs, its a bit larger than I'd
    like, but I included a patch that just moves code from one file to
    another and I'd like to avoid merge conflicts with that later, so it
    makes it seem worse than it is,

    Otherwise:
    - radeon: fixes to use new microcode to stabilise some cards, use
    some common displayport code, some runtime pm fixes, pll regression
    fixes
    - i915: fix for some context oopses, a warn in a used path, backlight
    fixes
    - nouveau: regression fix
    - omap: a bunch of fixes"

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (51 commits)
    drm: bochs: drop unused struct fields
    drm: bochs: add power management support
    drm: cirrus: add power management support
    drm: Split out drm_probe_helper.c from drm_crtc_helper.c
    drm/plane-helper: Don't fake-implement primary plane disabling
    drm/ast: fix value check in cbr_scan2
    drm/nouveau/bios: fix a bit shift error introduced by 457e77b
    drm/radeon/ci: make sure mc ucode is loaded before checking the size
    drm/radeon/si: make sure mc ucode is loaded before checking the size
    drm/radeon: improve PLL params if we don't match exactly v2
    drm/radeon: memory leak on bo reservation failure. v2
    drm/radeon: fix VCE fence command
    drm/radeon: re-enable mclk dpm on R7 260X asics
    drm/radeon: add support for newer mc ucode on CI (v2)
    drm/radeon: add support for newer mc ucode on SI (v2)
    drm/radeon: apply more strict limits for PLL params v2
    drm/radeon: update CI DPM powertune settings
    drm/radeon: fix runpm handling on APUs (v4)
    drm/radeon: disable mclk dpm on R7 260X
    drm/tegra: Remove gratuitous pad field
    ...

    Linus Torvalds
     

17 Apr, 2014

1 commit


16 Apr, 2014

1 commit

  • The version of the drm_tegra_submit structure that was merged all the
    way back in 3.10 contains a pad field that was originally intended to
    properly pad the following __u64 field. Unfortunately it seems like a
    different field was dropped during review that caused this padding to
    become unnecessary, but the pad field wasn't removed at that time.

    One possible side-effect of this is that since the __u64 following the
    pad is now no longer properly aligned, the compiler may (or may not)
    introduce padding itself, which results in no predictable ABI.

    Rectify this by removing the pad field so that all fields are again
    naturally aligned. Technically this is breaking existing userspace ABI,
    but given that there aren't any (released) userspace drivers that make
    use of this yet, the fallout should be minimal.

    Fixes: d43f81cbaf43 ("drm/tegra: Add gr2d device")
    Cc: # 3.10
    Signed-off-by: Thierry Reding

    Thierry Reding
     

13 Apr, 2014

2 commits

  • Pull media fixes from Mauro Carvalho Chehab:
    "A series of bug fix patches for v3.15-rc1. Most are just driver
    fixes. There are some changes at remote controller core level, fixing
    some definitions on a new API added for Kernel v3.15.

    It also adds the missing include at include/uapi/linux/v4l2-common.h,
    to allow its compilation on userspace, as pointed by you"

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (24 commits)
    [media] gpsca: remove the risk of a division by zero
    [media] stk1160: warrant a NUL terminated string
    [media] v4l: ti-vpe: retain v4l2_buffer flags for captured buffers
    [media] v4l: ti-vpe: Set correct field parameter for output and capture buffers
    [media] v4l: ti-vpe: zero out reserved fields in try_fmt
    [media] v4l: ti-vpe: Fix initial configuration queue data
    [media] v4l: ti-vpe: Use correct bus_info name for the device in querycap
    [media] v4l: ti-vpe: report correct capabilities in querycap
    [media] v4l: ti-vpe: Allow usage of smaller images
    [media] v4l: ti-vpe: Use video_device_release_empty
    [media] v4l: ti-vpe: Make sure in job_ready that we have the needed number of dst_bufs
    [media] lgdt3305: include sleep functionality in lgdt3304_ops
    [media] drx-j: use customise option correctly
    [media] m88rs2000: fix sparse static warnings
    [media] r820t: fix size and init values
    [media] rc-core: remove generic scancode filter
    [media] rc-core: split dev->s_filter
    [media] rc-core: do not change 32bit NEC scancode format for now
    [media] rtl28xxu: remove duplicate ID 0458:707f Genius TVGo DVB-T03
    [media] xc2028: add missing break to switch
    ...

    Linus Torvalds
     
  • Pull audit updates from Eric Paris.

    * git://git.infradead.org/users/eparis/audit: (28 commits)
    AUDIT: make audit_is_compat depend on CONFIG_AUDIT_COMPAT_GENERIC
    audit: renumber AUDIT_FEATURE_CHANGE into the 1300 range
    audit: do not cast audit_rule_data pointers pointlesly
    AUDIT: Allow login in non-init namespaces
    audit: define audit_is_compat in kernel internal header
    kernel: Use RCU_INIT_POINTER(x, NULL) in audit.c
    sched: declare pid_alive as inline
    audit: use uapi/linux/audit.h for AUDIT_ARCH declarations
    syscall_get_arch: remove useless function arguments
    audit: remove stray newline from audit_log_execve_info() audit_panic() call
    audit: remove stray newlines from audit_log_lost messages
    audit: include subject in login records
    audit: remove superfluous new- prefix in AUDIT_LOGIN messages
    audit: allow user processes to log from another PID namespace
    audit: anchor all pid references in the initial pid namespace
    audit: convert PPIDs to the inital PID namespace.
    pid: get pid_t ppid of task in init_pid_ns
    audit: rename the misleading audit_get_context() to audit_take_context()
    audit: Add generic compat syscall support
    audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL
    ...

    Linus Torvalds
     

12 Apr, 2014

1 commit

  • Pull NVMe driver updates from Matthew Wilcox:
    "Various updates to the NVMe driver. The most user-visible change is
    that drive hotplugging now works and CPU hotplug while an NVMe drive
    is installed should also work better"

    * git://git.infradead.org/users/willy/linux-nvme:
    NVMe: Retry failed commands with non-fatal errors
    NVMe: Add getgeo to block ops
    NVMe: Start-stop nvme_thread during device add-remove.
    NVMe: Make I/O timeout a module parameter
    NVMe: CPU hot plug notification
    NVMe: per-cpu io queues
    NVMe: Replace DEFINE_PCI_DEVICE_TABLE
    NVMe: Fix divide-by-zero in nvme_trans_io_get_num_cmds
    NVMe: IOCTL path RCU protect queue access
    NVMe: RCU protected access to io queues
    NVMe: Initialize device reference count earlier
    NVMe: Add CONFIG_PM_SLEEP to suspend/resume functions

    Linus Torvalds
     

11 Apr, 2014

1 commit

  • For commands returned with failed status, queue these for resubmission
    and continue retrying them until success or for a limited amount of
    time. The final timeout was arbitrarily chosen so requests can't be
    retried indefinitely.

    Since these are requeued on the nvmeq that submitted the command, the
    callbacks have to take an nvmeq instead of an nvme_dev as a parameter
    so that we can use the locked queue to append the iod to retry later.

    The nvme_iod conviently can be used to track how long we've been trying
    to successfully complete an iod request. The nvme_iod also provides the
    nvme prp dma mappings, so I had to move a few things around so we can
    keep those mappings.

    Signed-off-by: Keith Busch
    [fixed checkpatch issue with long line]
    Signed-off-by: Matthew Wilcox

    Keith Busch
     

09 Apr, 2014

1 commit

  • Pull drm updates from Dave Airlie:
    "Highlights:

    - drm:

    Generic display port aux features, primary plane support, drm
    master management fixes, logging cleanups, enforced locking checks
    (instead of docs), documentation improvements, minor number
    handling cleanup, pseudofs for shared inodes.

    - ttm:

    add ability to allocate from both ends

    - i915:

    broadwell features, power domain and runtime pm, per-process
    address space infrastructure (not enabled)

    - msm:

    power management, hdmi audio support

    - nouveau:

    ongoing GPU fault recovery, initial maxwell support, random fixes

    - exynos:

    refactored driver to clean up a lot of abstraction, DP support
    moved into drm, LVDS bridge support added, parallel panel support

    - gma500:

    SGX MMU support, SGX irq handling, asle irq work fixes

    - radeon:

    video engine bringup, ring handling fixes, use dp aux helpers

    - vmwgfx:

    add rendernode support"

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (849 commits)
    DRM: armada: fix corruption while loading cursors
    drm/dp_helper: don't return EPROTO for defers (v2)
    drm/bridge: export ptn3460_init function
    drm/exynos: remove MODULE_DEVICE_TABLE definitions
    ARM: dts: exynos4412-trats2: enable exynos/fimd node
    ARM: dts: exynos4210-trats: enable exynos/fimd node
    ARM: dts: exynos4412-trats2: add panel node
    ARM: dts: exynos4210-trats: add panel node
    ARM: dts: exynos4: add MIPI DSI Master node
    drm/panel: add S6E8AA0 driver
    ARM: dts: exynos4210-universal_c210: add proper panel node
    drm/panel: add ld9040 driver
    panel/ld9040: add DT bindings
    panel/s6e8aa0: add DT bindings
    drm/exynos: add DSIM driver
    exynos/dsim: add DT bindings
    drm/exynos: disallow fbdev initialization if no device is connected
    drm/mipi_dsi: create dsi devices only for nodes with reg property
    drm/mipi_dsi: add flags to DSI messages
    Skip intel_crt_init for Dell XPS 8700
    ...

    Linus Torvalds
     

08 Apr, 2014

2 commits

  • s/MADV_NODUMP/MADV_DONTDUMP/

    Signed-off-by: Zhang Yanfei
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Zhang Yanfei
     
  • Add VM_INIT_DEF_MASK, to allow us to set the default flags for VMs. It
    also adds a prctl control which allows us to set the THP disable bit in
    mm->def_flags so that VMs will pick up the setting as they are created.

    Signed-off-by: Alex Thorlton
    Suggested-by: Oleg Nesterov
    Cc: Gerald Schaefer
    Cc: Martin Schwidefsky
    Cc: Heiko Carstens
    Cc: Christian Borntraeger
    Cc: Paolo Bonzini
    Cc: "Kirill A. Shutemov"
    Cc: Mel Gorman
    Acked-by: Rik van Riel
    Cc: Ingo Molnar
    Cc: Peter Zijlstra
    Cc: Andrea Arcangeli
    Cc: Oleg Nesterov
    Cc: "Eric W. Biederman"
    Cc: Alexander Viro
    Cc: Johannes Weiner
    Cc: David Rientjes
    Cc: Paolo Bonzini
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alex Thorlton
     

06 Apr, 2014

1 commit

  • As reported by Linus, make headers_check is reporting:
    usr/include/linux/v4l2-common.h:72: found __[us]{8,16,32,64} type without #include

    which seems to have come in through commits 777f4f85b75f1 and
    254a47770163f.

    That happens because struct v4l2_edid should be visible by both
    subdev and V4L2 APIs. So, it was moved to v4l2-common.h.

    As Linus pointed, the proper fix is to just add an include for
    linux/types.h at v4l2-common.h.

    Reported-by: Linus Torvalds
    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     

05 Apr, 2014

8 commits

  • drm/tegra: Changes for v3.15-rc1

    Implement eDP support for Tegra124 and support the PRIME vmap()/vunmap()
    operations.

    A symbol that is required for upcoming V4L2 support is now exported by
    the host1x driver.

    Relicense drivers under the GPL v2 for consistency. One exception is the
    public header file, which is relicensed under MIT to abide by the common
    rule.

    * tag 'drm/tegra/for-3.15-rc1' of git://anongit.freedesktop.org/tegra/linux:
    drm/tegra: Use standard GPL v2 license text
    drm/tegra: Relicense under GPL v2
    drm/tegra: Relicense public header under MIT
    drm/tegra: Add eDP support
    gpu: host1x: export host1x_syncpt_incr_max() function
    drm/tegra: prime: Add vmap support

    Dave Airlie
     
  • Pull xfs update from Dave Chinner:
    "There are a couple of new fallocate features in this request - it was
    decided that it was easiest to push them through the XFS tree using
    topic branches and have the ext4 support be based on those branches.
    Hence you may see some overlap with the ext4 tree merge depending on
    how they including those topic branches into their tree. Other than
    that, there is O_TMPFILE support, some cleanups and bug fixes.

    The main changes in the XFS tree for 3.15-rc1 are:

    - O_TMPFILE support
    - allowing AIO+DIO writes beyond EOF
    - FALLOC_FL_COLLAPSE_RANGE support for fallocate syscall and XFS
    implementation
    - FALLOC_FL_ZERO_RANGE support for fallocate syscall and XFS
    implementation
    - IO verifier cleanup and rework
    - stack usage reduction changes
    - vm_map_ram NOIO context fixes to remove lockdep warings
    - various bug fixes and cleanups"

    * tag 'xfs-for-linus-3.15-rc1' of git://oss.sgi.com/xfs/xfs: (34 commits)
    xfs: fix directory hash ordering bug
    xfs: extra semi-colon breaks a condition
    xfs: Add support for FALLOC_FL_ZERO_RANGE
    fs: Introduce FALLOC_FL_ZERO_RANGE flag for fallocate
    xfs: inode log reservations are still too small
    xfs: xfs_check_page_type buffer checks need help
    xfs: avoid AGI/AGF deadlock scenario for inode chunk allocation
    xfs: use NOIO contexts for vm_map_ram
    xfs: don't leak EFSBADCRC to userspace
    xfs: fix directory inode iolock lockdep false positive
    xfs: allocate xfs_da_args to reduce stack footprint
    xfs: always do log forces via the workqueue
    xfs: modify verifiers to differentiate CRC from other errors
    xfs: print useful caller information in xfs_error_report
    xfs: add xfs_verifier_error()
    xfs: add helper for updating checksums on xfs_bufs
    xfs: add helper for verifying checksums on xfs_bufs
    xfs: Use defines for CRC offsets in all cases
    xfs: skip pointless CRC updates after verifier failures
    xfs: Add support FALLOC_FL_COLLAPSE_RANGE for fallocate
    ...

    Linus Torvalds
     
  • Pull ubifs updates from Artem Bityutskiy:
    "This pull request includes the 'ubiblock' driver which provides R/O
    block access to UBI volumes. It is useful for those who want to use
    squashfs on top of raw flash devices. UBI will provide bit-flip
    handling and wear-levelling in this case (e.g., if there are other UBI
    volumes with R/W UBIFS too).

    The driver is actually pretty small and it is part of the UBI kernel
    subsystem. Delivered by Ezequiel Garcia, along with a piece of
    documentation on the MTD web site and the user-space tool for creating
    and removing block devices"

    * tag 'upstream-3.15-rc1' of git://git.infradead.org/linux-ubifs:
    UBI: block: Remove __initdata from ubiblock_param_ops
    UBI: make UBI_IOCVOLCRBLK take a parameter for future usage
    UBI: rename block device ioctls
    UBI: block: Use ENOSYS as return value when CONFIG_UBIBLOCK=n
    UBI: block: Add CONFIG_BLOCK dependency
    UBI: block: Use 'u64' for the 64-bit dividend
    UBI: block: Mark init-only symbol as __initdata
    UBI: block: do not use term "attach"
    UBI: R/O block driver on top of UBI volumes

    Linus Torvalds
     
  • Pull fuse update from Miklos Szeredi:
    "This series adds cached writeback support to fuse, improving write
    throughput"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
    fuse: fix "uninitialized variable" warning
    fuse: Turn writeback cache on
    fuse: Fix O_DIRECT operations vs cached writeback misorder
    fuse: fuse_flush() should wait on writeback
    fuse: Implement write_begin/write_end callbacks
    fuse: restructure fuse_readpage()
    fuse: Flush files on wb close
    fuse: Trust kernel i_mtime only
    fuse: Trust kernel i_size only
    fuse: Connection bit for enabling writeback
    fuse: Prepare to handle short reads
    fuse: Linking file to inode helper

    Linus Torvalds
     
  • Pull GFS2 updates from Steven Whitehouse:
    "One of the main highlights this time, is not the patches themselves
    but instead the widening contributor base. It is good to see that
    interest is increasing in GFS2, and I'd like to thank all the
    contributors to this patch set.

    In addition to the usual set of bug fixes and clean ups, there are
    patches to improve inode creation performance when xattrs are required
    and some improvements to the transaction code which is intended to
    help improve scalability after further changes in due course.

    Journal extent mapping is also updated to make it more efficient and
    again, this is a foundation for future work in this area.

    The maximum number of ACLs has been increased to 300 (for a 4k block
    size) which means that even with a few additional xattrs from selinux,
    everything should fit within a single fs block.

    There is also a patch to bring GFS2's own copy of the writepages code
    up to the same level as the core VFS. Eventually we may be able to
    merge some of this code, since it is fairly similar.

    The other major change this time, is bringing consistency to the
    printing of messages via fs_, pr_ macros"

    * tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw: (29 commits)
    GFS2: Fix address space from page function
    GFS2: Fix uninitialized VFS inode in gfs2_create_inode
    GFS2: Fix return value in slot_get()
    GFS2: inline function gfs2_set_mode
    GFS2: Remove extraneous function gfs2_security_init
    GFS2: Increase the max number of ACLs
    GFS2: Re-add a call to log_flush_wait when flushing the journal
    GFS2: Ensure workqueue is scheduled after noexp request
    GFS2: check NULL return value in gfs2_ok_to_move
    GFS2: Convert gfs2_lm_withdraw to use fs_err
    GFS2: Use fs_ more often
    GFS2: Use pr_ more consistently
    GFS2: Move recovery variables to journal structure in memory
    GFS2: global conversion to pr_foo()
    GFS2: return -E2BIG if hit the maximum limits of ACLs
    GFS2: Clean up journal extent mapping
    GFS2: replace kmalloc - __vmalloc / memset 0
    GFS2: Remove extra "if" in gfs2_log_flush()
    fs: NULL dereference in posix_acl_to_xattr()
    GFS2: Move log buffer accounting to transaction
    ...

    Linus Torvalds
     
  • Pull file locking updates from Jeff Layton:
    "Highlights:

    - maintainership change for fs/locks.c. Willy's not interested in
    maintaining it these days, and is OK with Bruce and I taking it.
    - fix for open vs setlease race that Al ID'ed
    - cleanup and consolidation of file locking code
    - eliminate unneeded BUG() call
    - merge of file-private lock implementation"

    * 'locks-3.15' of git://git.samba.org/jlayton/linux:
    locks: make locks_mandatory_area check for file-private locks
    locks: fix locks_mandatory_locked to respect file-private locks
    locks: require that flock->l_pid be set to 0 for file-private locks
    locks: add new fcntl cmd values for handling file private locks
    locks: skip deadlock detection on FL_FILE_PVT locks
    locks: pass the cmd value to fcntl_getlk/getlk64
    locks: report l_pid as -1 for FL_FILE_PVT locks
    locks: make /proc/locks show IS_FILE_PVT locks as type "FLPVT"
    locks: rename locks_remove_flock to locks_remove_file
    locks: consolidate checks for compatible filp->f_mode values in setlk handlers
    locks: fix posix lock range overflow handling
    locks: eliminate BUG() call when there's an unexpected lock on file close
    locks: add __acquires and __releases annotations to locks_start and locks_stop
    locks: remove "inline" qualifier from fl_link manipulation functions
    locks: clean up comment typo
    locks: close potential race between setlease and open
    MAINTAINERS: update entry for fs/locks.c

    Linus Torvalds
     
  • Pull renameat2 system call from Miklos Szeredi:
    "This adds a new syscall, renameat2(), which is the same as renameat()
    but with a flags argument.

    The purpose of extending rename is to add cross-rename, a symmetric
    variant of rename, which exchanges the two files. This allows
    interesting things, which were not possible before, for example
    atomically replacing a directory tree with a symlink, etc... This
    also allows overlayfs and friends to operate on whiteouts atomically.

    Andy Lutomirski also suggested a "noreplace" flag, which disables the
    overwriting behavior of rename.

    These two flags, RENAME_EXCHANGE and RENAME_NOREPLACE are only
    implemented for ext4 as an example and for testing"

    * 'cross-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
    ext4: add cross rename support
    ext4: rename: split out helper functions
    ext4: rename: move EMLINK check up
    ext4: rename: create ext4_renament structure for local vars
    vfs: add cross-rename
    vfs: lock_two_nondirectories: allow directory args
    security: add flags to rename hooks
    vfs: add RENAME_NOREPLACE flag
    vfs: add renameat2 syscall
    vfs: rename: use common code for dir and non-dir
    vfs: rename: move d_move() up
    vfs: add d_is_dir()

    Linus Torvalds
     
  • Pull media updates from Mauro Carvalho Chehab:
    "The main set of series of patches for media subsystem, including:
    - document RC sysfs class
    - added an API to setup scancode to allow waking up systems using the
    Remote Controller
    - add API for SDR devices. Drivers are still on staging
    - some API improvements for getting EDID data from media
    inputs/outputs
    - new DVB frontend driver for drx-j (ATSC)
    - one driver (it913x/it9137) got removed, in favor of an improvement
    on another driver (af9035)
    - added a skeleton V4L2 PCI driver at documentation
    - added a dual flash driver (lm3646)
    - added a new IR driver (img-ir)
    - added an IR scancode decoder for the Sharp protocol
    - some improvements at the usbtv driver, to allow its core to be
    reused.
    - added a new SDR driver (rtl2832u_sdr)
    - added a new tuner driver (msi001)
    - several improvements at em28xx driver to fix PM support, device
    removal and to split the V4L2 specific bits into a separate
    sub-driver
    - one driver got converted to videobuf2 (s2255drv)
    - the e4000 tuner driver now follows an improved binding model
    - some fixes at V4L2 compat32 code
    - several fixes and enhancements at videobuf2 code
    - some cleanups at V4L2 API documentation
    - usual driver enhancements, new board additions and misc fixups"

    [ NOTE! This merge effective drops commit 4329b93b283c ("of: Reduce
    indentation in of_graph_get_next_endpoint").

    The of_graph_get_next_endpoint() function was moved and renamed by
    commit fd9fdb78a9bf ("[media] of: move graph helpers from
    drivers/media/v4l2-core to drivers/of"). It was originally called
    v4l2_of_get_next_endpoint() and lived in the file
    drivers/media/v4l2-core/v4l2-of.c.

    In that original location, it was then fixed to support empty port
    nodes by commit b9db140c1e46 ("[media] v4l: of: Support empty port
    nodes"), and that commit clashes badly with the dropped "Reduce
    intendation" commit. I had to choose one or the other, and decided
    that the "Support empty port nodes" commit was more important ]

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (426 commits)
    [media] em28xx-dvb: fix PCTV 461e tuner I2C binding
    Revert "[media] em28xx-dvb: fix PCTV 461e tuner I2C binding"
    [media] em28xx: fix PCTV 290e LNA oops
    [media] em28xx-dvb: fix PCTV 461e tuner I2C binding
    [media] m88ds3103: fix bug on .set_tone()
    [media] saa7134: fix WARN_ON during resume
    [media] v4l2-dv-timings: add module name, description, license
    [media] videodev2.h: add parenthesis around macro arguments
    [media] saa6752hs: depends on CRC32
    [media] si4713: fix Kconfig dependencies
    [media] Sensoray 2255 uses videobuf2
    [media] adv7180: free an interrupt on failure paths in init_device()
    [media] e4000: make VIDEO_V4L2 dependency optional
    [media] af9033: Don't export functions for the hardware filter
    [media] af9035: use af9033 PID filters
    [media] af9033: implement PID filter
    [media] rtl2832_sdr: do not use dynamic stack allocation
    [media] e4000: fix 32-bit build error
    [media] em28xx-audio: make sure audio is unmuted on open()
    [media] DocBook media: v4l2_format_sdr was renamed to v4l2_sdr_format
    ...

    Linus Torvalds
     

04 Apr, 2014

6 commits

  • This file will eventually be exported to libdrm, where all the public
    header files use the MIT license.

    Reported-by: Erik Faye-Lund
    Acked-by: Stephen Warren
    Acked-by: Emil Goode
    Signed-off-by: Thierry Reding

    Thierry Reding
     
  • Pull input updates from Dmitry Torokhov:
    "The first round of updates for the input subsystem.

    Just new drivers and existing driver fixes, no core changes except for
    the new uinput IOCTL to allow userspace to fetch sysfs name of the
    input device that was created"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (43 commits)
    Input: edt-ft5x06 - add a missing condition
    Input: appletouch - fix jumps when additional fingers are detected
    Input: appletouch - implement sensor data smoothing
    Input: add driver for SOC button array
    Input: pm8xxx-vibrator - add DT match table
    Input: pmic8xxx-pwrkey - migrate to DT
    Input: pmic8xxx-keypad - migrate to DT
    Input: pmic8xxx-keypad - migrate to regmap APIs
    Input: pmic8xxx-keypad - migrate to devm_* APIs
    Input: pmic8xxx-keypad - fix build by removing gpio configuration
    Input: add new driver for ARM CLPS711X keypad
    Input: edt-ft5x06 - add support for M09 firmware version
    Input: edt-ft5x06 - ignore touchdown events
    Input: edt-ft5x06 - adjust delays to conform datasheet
    Input: edt-ft5x06 - add DT support
    Input: edt-ft5x06 - several cleanups; no functional change
    Input: appletouch - dial back fuzz setting
    Input: remove obsolete tnetv107x drivers
    Input: sirfsoc-onkey - set the capability of reporting KEY_POWER
    Input: da9052_onkey - use correct register bit for key status
    ...

    Linus Torvalds
     
  • Merge first patch-bomb from Andrew Morton:
    - Various misc bits
    - kmemleak fixes
    - small befs, codafs, cifs, efs, freexxfs, hfsplus, minixfs, reiserfs things
    - fanotify
    - I appear to have become SuperH maintainer
    - ocfs2 updates
    - direct-io tweaks
    - a bit of the MM queue
    - printk updates
    - MAINTAINERS maintenance
    - some backlight things
    - lib/ updates
    - checkpatch updates
    - the rtc queue
    - nilfs2 updates
    - Small Documentation/ updates

    * emailed patches from Andrew Morton : (237 commits)
    Documentation/SubmittingPatches: remove references to patch-scripts
    Documentation/SubmittingPatches: update some dead URLs
    Documentation/filesystems/ntfs.txt: remove changelog reference
    Documentation/kmemleak.txt: updates
    fs/reiserfs/super.c: add __init to init_inodecache
    fs/reiserfs: move prototype declaration to header file
    fs/hfsplus/attributes.c: add __init to hfsplus_create_attr_tree_cache()
    fs/hfsplus/extents.c: fix concurrent acess of alloc_blocks
    fs/hfsplus/extents.c: remove unused variable in hfsplus_get_block
    nilfs2: update project's web site in nilfs2.txt
    nilfs2: update MAINTAINERS file entries fix
    nilfs2: verify metadata sizes read from disk
    nilfs2: add FITRIM ioctl support for nilfs2
    nilfs2: add nilfs_sufile_trim_fs to trim clean segs
    nilfs2: implementation of NILFS_IOCTL_SET_SUINFO ioctl
    nilfs2: add nilfs_sufile_set_suinfo to update segment usage
    nilfs2: add struct nilfs_suinfo_update and flags
    nilfs2: update MAINTAINERS file entries
    fs/coda/inode.c: add __init to init_inodecache()
    BEFS: logging cleanup
    ...

    Linus Torvalds
     
  • If the glibc xattr.h header is included after the uapi header,
    compilation fails due to an enum re-using a #define from the uapi
    header.

    Protect against this by guarding the define and enum inclusions against
    each other.

    (See https://lists.debian.org/debian-glibc/2014/03/msg00029.html
    and https://sourceware.org/glibc/wiki/Synchronizing_Headers
    for more information.)

    Signed-off-by: Serge Hallyn
    Cc: Andrew Morton
    Cc: Allan McRae
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Serge Hallyn
     
  • * 'msm-next' of git://people.freedesktop.org/~robclark/linux:
    drm/omap: Don't dereference list head when the connectors list is empty
    drm/msm/mdp: add timeout for irq wait
    drm/msm: validate flags, etc
    drm/msm: use componentised device support
    drm/msm: add chip-id param
    drm/msm: crank down gpu when inactive
    drm/msm: spin helper
    drm/msm: add hang_debug module param
    drm/msm: hdmi audio support

    Dave Airlie
     
  • Pull VFIO updates from Alex Williamson:
    "VFIO updates for v3.15 include:

    - Allow the vfio-type1 IOMMU to support multiple domains within a
    container
    - Plumb path to query whether all domains are cache-coherent
    - Wire query into kvm-vfio device to avoid KVM x86 WBINVD emulation
    - Always select CONFIG_ANON_INODES, vfio depends on it (Arnd)

    The first patch also makes the vfio-type1 IOMMU driver completely
    independent of the bus_type of the devices it's handling, which
    enables it to be used for both vfio-pci and a future vfio-platform
    (and hopefully combinations involving both simultaneously)"

    * tag 'vfio-v3.15-rc1' of git://github.com/awilliam/linux-vfio:
    vfio: always select ANON_INODES
    kvm/vfio: Support for DMA coherent IOMMUs
    vfio: Add external user check extension interface
    vfio/type1: Add extension to test DMA cache coherence of IOMMU
    vfio/iommu_type1: Multi-IOMMU domain support

    Linus Torvalds
     

03 Apr, 2014

5 commits

  • Pull networking updates from David Miller:
    "Here is my initial pull request for the networking subsystem during
    this merge window:

    1) Support for ESN in AH (RFC 4302) from Fan Du.

    2) Add full kernel doc for ethtool command structures, from Ben
    Hutchings.

    3) Add BCM7xxx PHY driver, from Florian Fainelli.

    4) Export computed TCP rate information in netlink socket dumps, from
    Eric Dumazet.

    5) Allow IPSEC SA to be dumped partially using a filter, from Nicolas
    Dichtel.

    6) Convert many drivers to pci_enable_msix_range(), from Alexander
    Gordeev.

    7) Record SKB timestamps more efficiently, from Eric Dumazet.

    8) Switch to microsecond resolution for TCP round trip times, also
    from Eric Dumazet.

    9) Clean up and fix 6lowpan fragmentation handling by making use of
    the existing inet_frag api for it's implementation.

    10) Add TX grant mapping to xen-netback driver, from Zoltan Kiss.

    11) Auto size SKB lengths when composing netlink messages based upon
    past message sizes used, from Eric Dumazet.

    12) qdisc dumps can take a long time, add a cond_resched(), From Eric
    Dumazet.

    13) Sanitize netpoll core and drivers wrt. SKB handling semantics.
    Get rid of never-used-in-tree netpoll RX handling. From Eric W
    Biederman.

    14) Support inter-address-family and namespace changing in VTI tunnel
    driver(s). From Steffen Klassert.

    15) Add Altera TSE driver, from Vince Bridgers.

    16) Optimizing csum_replace2() so that it doesn't adjust the checksum
    by checksumming the entire header, from Eric Dumazet.

    17) Expand BPF internal implementation for faster interpreting, more
    direct translations into JIT'd code, and much cleaner uses of BPF
    filtering in non-socket ocntexts. From Daniel Borkmann and Alexei
    Starovoitov"

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1976 commits)
    netpoll: Use skb_irq_freeable to make zap_completion_queue safe.
    net: Add a test to see if a skb is freeable in irq context
    qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port'
    net: ptp: move PTP classifier in its own file
    net: sxgbe: make "core_ops" static
    net: sxgbe: fix logical vs bitwise operation
    net: sxgbe: sxgbe_mdio_register() frees the bus
    Call efx_set_channels() before efx->type->dimension_resources()
    xen-netback: disable rogue vif in kthread context
    net/mlx4: Set proper build dependancy with vxlan
    be2net: fix build dependency on VxLAN
    mac802154: make csma/cca parameters per-wpan
    mac802154: allow only one WPAN to be up at any given time
    net: filter: minor: fix kdoc in __sk_run_filter
    netlink: don't compare the nul-termination in nla_strcmp
    can: c_can: Avoid led toggling for every packet.
    can: c_can: Simplify TX interrupt cleanup
    can: c_can: Store dlc private
    can: c_can: Reduce register access
    can: c_can: Make the code readable
    ...

    Linus Torvalds
     
  • Pull HID updates from Jiri Kosina:
    - substantial cleanup of the generic and transport layers, in the
    direction of an ultimate goal of making struct hid_device completely
    transport independent, by Benjamin Tissoires
    - cp2112 driver from David Barksdale
    - a lot of fixes and new hardware support (Dualshock 4) to hid-sony
    driver, by Frank Praznik
    - support for Win 8.1 multitouch protocol by Andrew Duggan
    - other smaller fixes / device ID additions

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (75 commits)
    HID: sony: fix force feedback mismerge
    HID: sony: Set the quriks flag for Bluetooth controllers
    HID: sony: Fix Sixaxis cable state detection
    HID: uhid: Add UHID_CREATE2 + UHID_INPUT2
    HID: hyperv: fix _raw_request() prototype
    HID: hyperv: Implement a stub raw_request() entry point
    HID: hid-sensor-hub: fix sleeping function called from invalid context
    HID: multitouch: add support for Win 8.1 multitouch touchpads
    HID: remove hid_output_raw_report transport implementations
    HID: sony: do not rely on hid_output_raw_report
    HID: cp2112: remove the last hid_output_raw_report() call
    HID: cp2112: remove various hid_out_raw_report calls
    HID: multitouch: add support of other generic collections in hid-mt
    HID: multitouch: remove pen special handling
    HID: multitouch: remove registered devices with default behavior
    HID: hidp: Add a comment that some devices depend on the current behavior of uniq
    HID: sony: Prevent duplicate controller connections.
    HID: sony: Perform a boundry check on the sixaxis battery level index.
    HID: sony: Fix work queue issues
    HID: sony: Fix multi-line comment styling
    ...

    Linus Torvalds
     
  • Pull trivial tree updates from Jiri Kosina:
    "Usual rocket science -- mostly documentation and comment updates"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
    sparse: fix comment
    doc: fix double words
    isdn: capi: fix "CAPI_VERSION" comment
    doc: DocBook: Fix typos in xml and template file
    Bluetooth: add module name for btwilink
    driver core: unexport static function create_syslog_header
    mmc: core: typo fix in printk specifier
    ARM: spear: clean up editing mistake
    net-sysfs: fix comment typo 'CONFIG_SYFS'
    doc: Insert MODULE_ in module-signing macros
    Documentation: update URL to hfsplus Technote 1150
    gpio: update path to documentation
    ixgbe: Fix format string in ixgbe_fcoe.
    Kconfig: Remove useless "default N" lines
    user_namespace.c: Remove duplicated word in comment
    CREDITS: fix formatting
    treewide: Fix typo in Documentation/DocBook
    mm: Fix warning on make htmldocs caused by slab.c
    ata: ata-samsung_cf: cleanup in header file
    idr: remove unused prototype of idr_free()

    Linus Torvalds
     
  • Pull kvm updates from Paolo Bonzini:
    "PPC and ARM do not have much going on this time. Most of the cool
    stuff, instead, is in s390 and (after a few releases) x86.

    ARM has some caching fixes and PPC has transactional memory support in
    guests. MIPS has some fixes, with more probably coming in 3.16 as
    QEMU will soon get support for MIPS KVM.

    For x86 there are optimizations for debug registers, which trigger on
    some Windows games, and other important fixes for Windows guests. We
    now expose to the guest Broadwell instruction set extensions and also
    Intel MPX. There's also a fix/workaround for OS X guests, nested
    virtualization features (preemption timer), and a couple kvmclock
    refinements.

    For s390, the main news is asynchronous page faults, together with
    improvements to IRQs (floating irqs and adapter irqs) that speed up
    virtio devices"

    * tag 'kvm-3.15-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (96 commits)
    KVM: PPC: Book3S HV: Save/restore host PMU registers that are new in POWER8
    KVM: PPC: Book3S HV: Fix decrementer timeouts with non-zero TB offset
    KVM: PPC: Book3S HV: Don't use kvm_memslots() in real mode
    KVM: PPC: Book3S HV: Return ENODEV error rather than EIO
    KVM: PPC: Book3S: Trim top 4 bits of physical address in RTAS code
    KVM: PPC: Book3S HV: Add get/set_one_reg for new TM state
    KVM: PPC: Book3S HV: Add transactional memory support
    KVM: Specify byte order for KVM_EXIT_MMIO
    KVM: vmx: fix MPX detection
    KVM: PPC: Book3S HV: Fix KVM hang with CONFIG_KVM_XICS=n
    KVM: PPC: Book3S: Introduce hypervisor call H_GET_TCE
    KVM: PPC: Book3S HV: Fix incorrect userspace exit on ioeventfd write
    KVM: s390: clear local interrupts at cpu initial reset
    KVM: s390: Fix possible memory leak in SIGP functions
    KVM: s390: fix calculation of idle_mask array size
    KVM: s390: randomize sca address
    KVM: ioapic: reinject pending interrupts on KVM_SET_IRQCHIP
    KVM: Bump KVM_MAX_IRQ_ROUTES for s390
    KVM: s390: irq routing for adapter interrupts.
    KVM: s390: adapter interrupt sources
    ...

    Linus Torvalds
     
  • 1000-1099 is for configuring things. So auditd ignored such messages.
    This is about actually logging what was configured. Move it into the
    range for such types of messages.

    Reported-by: Steve Grubb
    Signed-off-by: Eric Paris

    Eric Paris
     

02 Apr, 2014

8 commits

  • Introduce a bit kernel and userspace exchange between each-other on
    the init stage and turn writeback on if the userspace want this and
    mount option 'allow_wbcache' is present (controlled by fusermount).

    Also add each writable file into per-inode write list and call the
    generic_file_aio_write to make use of the Linux page cache engine.

    Signed-off-by: Maxim Patlasov
    Signed-off-by: Miklos Szeredi

    Pavel Emelyanov
     
  • Here's the latest iteration of the universal planes work, which I believe is
    finally ready for merging. Aside from the minor driver patches to use the
    new drm_for_each_legacy_plane() macro for plane loops, these should all have
    an r-b from Rob Clark now.

    Actual userspace-visibility is currently hidden behind a
    drm.universal_planes module parameter so that we can do some experimental
    testing of this before flipping it on universally.

    * 'primary-plane' of git://people.freedesktop.org/~robclark/linux:
    drm/doc: Update plane documentation and add plane helper library
    drm: Allow userspace to ask for universal plane list (v2)
    drm: Remove unused drm_crtc->fb
    drm: Replace crtc fb with primary plane fb (v3)
    drm/msm: Switch to universal plane API's
    drm: Add drm_crtc_init_with_planes() (v2)
    drm: Add plane type property (v2)
    drm: Add drm_universal_plane_init()
    drm: Add primary plane helpers (v3)
    drm: Make drm_crtc_check_viewport non-static
    drm/shmobile: Restrict plane loops to only operate on legacy planes
    drm/i915: Restrict plane loops to only operate on overlay planes (v2)
    drm/exynos: Restrict plane loops to only operate on overlay planes (v2)
    drm: Add support for multiple plane types (v2)

    Dave Airlie
     
  • Earlier this week, there was a bit of confusion about those new
    capabilities, to the point I think it's better to document the intention
    and API contract.

    The comment documents the current situation:
    - the radeon driver returns the only valid size for the hw
    - i915 returns the maximun cursor size
    - other drivers fall back to returning 64x64

    The common contract is to return a valid cursor size.

    Cc: Sagar Kamble
    Cc: Chris Wilson
    Cc: Alex Deucher
    Cc: Imre Deak
    Signed-off-by: Damien Lespiau
    Reviewed-by: Chris Wilson
    Reviewed-by: Alex Deucher
    Signed-off-by: Dave Airlie

    Lespiau, Damien
     
  • Userspace clients which wish to receive all DRM planes (primary and
    cursor planes in addition to the traditional overlay planes) may set the
    DRM_CLIENT_CAP_UNIVERSAL_PLANES capability.

    v2: Hide behind drm.universal_planes module option [suggested by
    Daniel Vetter]

    Signed-off-by: Matt Roper
    Reviewed-by: Rob Clark

    Matt Roper
     
  • Pull USB patches from Greg KH:
    "Here's the big USB pull request for 3.15-rc1.

    The normal set of patches, lots of controller driver updates, and a
    smattering of individual USB driver updates as well.

    All have been in linux-next for a while"

    * tag 'usb-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (249 commits)
    xhci: Transition maintainership to Mathias Nyman.
    USB: disable reset-resume when USB_QUIRK_RESET is set
    USB: unbind all interfaces before rebinding any
    usb: phy: Add ulpi IDs for SMSC USB3320 and TI TUSB1210
    usb: gadget: tcm_usb_gadget: stop format strings
    usb: gadget: f_fs: add missing spinlock and mutex unlock
    usb: gadget: composite: switch over to ERR_CAST()
    usb: gadget: inode: switch over to memdup_user()
    usb: gadget: f_subset: switch over to PTR_RET
    usb: gadget: lpc32xx_udc: fix wrong clk_put() sequence
    USB: keyspan: remove dead debugging code
    USB: serial: add missing newlines to dev_ messages.
    USB: serial: add missing braces
    USB: serial: continue to write on errors
    USB: serial: continue to read on errors
    USB: serial: make bulk_out_size a lower limit
    USB: cypress_m8: fix potential scheduling while atomic
    devicetree: bindings: document lsi,zevio-usb
    usb: chipidea: add support for USB OTG controller on LSI Zevio SoCs
    usb: chipidea: imx: Use dev_name() for ci_hdrc name to distinguish USBs
    ...

    Linus Torvalds
     
  • Pull char/misc driver patches from Greg KH:
    "Here's the big char/misc driver updates for 3.15-rc1.

    Lots of various things here, including the new mcb driver subsystem.

    All of these have been in linux-next for a while"

    * tag 'char-misc-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (118 commits)
    extcon: Move OF helper function to extcon core and change function name
    extcon: of: Remove unnecessary function call by using the name of device_node
    extcon: gpio: Use SIMPLE_DEV_PM_OPS macro
    extcon: palmas: Use SIMPLE_DEV_PM_OPS macro
    mei: don't use deprecated DEFINE_PCI_DEVICE_TABLE macro
    mei: amthif: fix checkpatch error
    mei: client.h fix checkpatch errors
    mei: use cl_dbg where appropriate
    mei: fix Unnecessary space after function pointer name
    mei: report consistently copy_from/to_user failures
    mei: drop pr_fmt macros
    mei: make me hw headers private to me hw.
    mei: fix memory leak of pending write cb objects
    mei: me: do not reset when less than expected data is received
    drivers: mcb: Fix build error discovered by 0-day bot
    cs5535-mfgpt: Simplify dependencies
    spmi: pm: drop bus-level PM suspend/resume routines
    spmi: pmic_arb: make selectable on ARCH_QCOM
    Drivers: hv: vmbus: Increase the limit on the number of pfns we can handle
    pch_phub: Report error writing MAC back to user
    ...

    Linus Torvalds
     
  • Pull spi Updates from Mark Brown:
    "A busy release for both cleanups and new drivers this time along with
    further factoring out of replicated code into the core:

    - Provide support in the core for DMA mapping transfers - essentially
    all drivers weren't implementing this properly, now there's no
    excuse.
    - Dual and quad mode support for spidev.
    - Fix handling of cs_change in the generic implementation.
    - Remove the S3C_DMA code from the s3c64xx driver now that all the
    platforms using it have been converted to dmaengine.
    - Lots of improvements to the Renesas SPI controllers.
    - Drivers for Allwinner A10 and A31, Qualcomm QUP and Xylinx xtfpga.
    - Removal of the bitrotted ti-ssp driver"

    * tag 'spi-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (199 commits)
    spi: Fix handling of cs_change in core implementation
    spi: bitbang: Make spi_bitbang_stop() return void
    spi: mpc52xx: Convert to use bits_per_word_mask
    spi: omap-100k: Fix memory leak
    spi: dw: Don't call kfree for memory allocated by devm_kzalloc
    spi: fsl-dspi: Fix memory leak
    spi: omap-uwire: add missing iounmap
    spi: clps711x: Convert to use master->max_speed_hz
    spi: clps711x: Enable driver compilation with COMPILE_TEST
    spi: omap-uwire: Remove full duplex check
    spi: Do not require a completion
    spi: topcliff-pch: Transform noisy message to dev_vdbg
    spi: coldfire-qspi: Simplify the code to set register bits for transfer speed
    spi: bcm63xx: Remove unused define for PFX
    spi: efm32: use $vendor,$device scheme for compatible string
    spi: clps711x: Remove dependency
    spi: topcliff-pch: Properly unregister platform devices on probe() error paths
    spi: fsl-espi: Remove unused bits_per_word variable in fsl_espi_bufs
    spi: altera: Remove the code to get unused platform_data
    spi: fsl-lib: Fix memory leak of pinfo
    ...

    Linus Torvalds
     
  • UHID_CREATE2:
    HID report descriptor data (rd_data) is an array in struct uhid_create2_req,
    instead of a pointer. Enables use from languages that don't support pointers,
    e.g. Python.

    UHID_INPUT2:
    Data array is the last field of struct uhid_input2_req. Enables userspace to
    write only the required bytes to kernel (ev.type + ev.u.input2.size + the part
    of the data array that matters), instead of the entire struct uhid_input2_req.

    Note:
    UHID_CREATE2 increases the total size of struct uhid_event slightly, thus
    increasing the size of messages that are queued for userspace. However, this
    won't affect the userspace processing of these events.

    [Jiri Kosina : adjust to hid_get_raw_report() and
    hid_output_raw_report() API changes]

    Signed-off-by: Petri Gynther
    Reviewed-by: David Herrmann
    Signed-off-by: Jiri Kosina

    Petri Gynther
     

01 Apr, 2014

2 commits

  • If flags contain RENAME_EXCHANGE then exchange source and destination files.
    There's no restriction on the type of the files; e.g. a directory can be
    exchanged with a symlink.

    Signed-off-by: Miklos Szeredi
    Reviewed-by: Jan Kara
    Reviewed-by: J. Bruce Fields

    Miklos Szeredi
     
  • If this flag is specified and the target of the rename exists then the
    rename syscall fails with EEXIST.

    The VFS does the existence checking, so it is trivial to enable for most
    local filesystems. This patch only enables it in ext4.

    For network filesystems the VFS check is not enough as there may be a race
    between a remote create and the rename, so these filesystems need to handle
    this flag in their ->rename() implementations to ensure atomicity.

    Andy writes about why this is useful:

    "The trivial answer: to eliminate the race condition from 'mv -i'.

    Another answer: there's a common pattern to atomically create a file
    with contents: open a temporary file, write to it, optionally fsync
    it, close it, then link(2) it to the final name, then unlink the
    temporary file.

    The reason to use link(2) is because it won't silently clobber the destination.

    This is annoying:
    - It requires an extra system call that shouldn't be necessary.
    - It doesn't work on (IMO sensible) filesystems that don't support
    hard links (e.g. vfat).
    - It's not atomic -- there's an intermediate state where both files exist.
    - It's ugly.

    The new rename flag will make this totally sensible.

    To be fair, on new enough kernels, you can also use O_TMPFILE and
    linkat to achieve the same thing even more cleanly."

    Suggested-by: Andy Lutomirski
    Signed-off-by: Miklos Szeredi
    Reviewed-by: J. Bruce Fields

    Miklos Szeredi