16 Jun, 2014

1 commit

  • Pull more clock framework updates from Mike Turquette:
    "This contains the second half the of the clk changes for 3.16.

    They are simply fixes and code refactoring for the OMAP clock drivers.
    The sunxi clock driver changes include splitting out the one
    mega-driver into several smaller pieces and adding support for the A31
    SoC clocks"

    * tag 'clk-for-linus-3.16-part2' of git://git.linaro.org/people/mike.turquette/linux: (25 commits)
    clk: sunxi: document PRCM clock compatible strings
    clk: sunxi: add PRCM (Power/Reset/Clock Management) clks support
    clk: sun6i: Protect SDRAM gating bit
    clk: sun6i: Protect CPU clock
    clk: sunxi: Rework clock protection code
    clk: sunxi: Move the GMAC clock to a file of its own
    clk: sunxi: Move the 24M oscillator to a file of its own
    clk: sunxi: Remove calls to clk_put
    clk: sunxi: document new A31 USB clock compatible
    clk: sunxi: Implement A31 USB clock
    ARM: dts: OMAP5/DRA7: use omap5-mpu-dpll-clock capable of dealing with higher frequencies
    CLK: TI: dpll: support OMAP5 MPU DPLL that need special handling for higher frequencies
    ARM: OMAP5+: dpll: support Duty Cycle Correction(DCC)
    CLK: TI: clk-54xx: Set the rate for dpll_abe_m2x2_ck
    CLK: TI: Driver for DRA7 ATL (Audio Tracking Logic)
    dt:/bindings: DRA7 ATL (Audio Tracking Logic) clock bindings
    ARM: dts: dra7xx-clocks: Correct name for atl clkin3 clock
    CLK: TI: gate: add composite interface clock to OMAP2 only build
    ARM: OMAP2: clock: add DT boot support for cpufreq_ck
    CLK: TI: OMAP2: add clock init support
    ...

    Linus Torvalds
     

15 Jun, 2014

2 commits

  • Pull x86 vdso fixes from Peter Anvin:
    "Fixes for x86/vdso.

    One is a simple build fix for bigendian hosts, one is to make "make
    vdso_install" work again, and the rest is about working around a bug
    in Google's Go language -- two are documentation patches that improves
    the sample code that the Go coders took, modified, and broke; the
    other two implements a workaround that keeps existing Go binaries from
    segfaulting at least"

    * 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86/vdso: Fix vdso_install
    x86/vdso: Hack to keep 64-bit Go programs working
    x86/vdso: Add PUT_LE to store little-endian values
    x86/vdso/doc: Make vDSO examples more portable
    x86/vdso/doc: Rename vdso_test.c to vdso_standalone_test_x86.c
    x86, vdso: Remove one final use of htole16()

    Linus Torvalds
     
  • Pull hwmon updates from Guenter Roeck:
    - new driver for Sensirion SHTC1 humidity / temperature sensor
    - convert ltc4151 and vexpress drivers to use devm functions
    - drop generic chip detection from lm85 driver
    - avoid forward declarations in atxp1 driver
    - fix sign extensions in ina2xx driver

    * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
    hwmon: vexpress: Use devm helper for hwmon device registration
    hwmon: (atxp1) Avoid forward declaration
    hwmon: add support for Sensirion SHTC1 sensor
    hwmon: (ltc4151) Convert to devm_hwmon_device_register_with_groups
    hwmon: (lm85) Drop generic detection
    hwmon: (ina2xx) Cast to s16 on shunt and current regs

    Linus Torvalds
     

13 Jun, 2014

12 commits

  • Pull kbuild misc updates from Michal Marek:
    "This is the non-critical part of kbuild for v3.16-rc1:
    - make deb-pkg can do s390x and arm64
    - new patterns in scripts/tags.sh
    - scripts/tags.sh skips userspace tools' sources (which sometimes
    have copies of kernel structures) and symlinks
    - improvements to the objdiff tool
    - two new coccinelle patches
    - other minor fixes"

    * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    scripts: objdiff: support directories for the augument of record command
    scripts: objdiff: fix a comment
    scripts: objdiff: change the extension of disassembly from .o to .dis
    scripts: objdiff: improve path flexibility for record command
    scripts: objdiff: remove unnecessary code
    scripts: objdiff: direct error messages to stderr
    scripts: objdiff: get the path to .tmp_objdiff more simply
    deb-pkg: Add automatic support for s390x architecture
    coccicheck: Add unneeded return variable test
    kbuild: Fix a typo in documentation
    kbuild: trivial - use tabs for code indent where possible
    kbuild: trivial - remove trailing empty lines
    coccinelle: Check for missing NULL terminators in of_device_id tables
    scripts/tags.sh: ignore symlink'ed source files
    scripts/tags.sh: add regular expression replacement pattern for memcg
    builddeb: add arm64 in the supported architectures
    builddeb: use $OBJCOPY variable instead of objcopy
    scripts/tags.sh: ignore code of user space tools
    scripts/tags.sh: add pattern for DEFINE_HASHTABLE
    .gitignore: ignore Module.symvers in all directories

    Linus Torvalds
     
  • Pull more perf updates from Ingo Molnar:
    "A second round of perf updates:

    - wide reaching kprobes sanitization and robustization, with the hope
    of fixing all 'probe this function crashes the kernel' bugs, by
    Masami Hiramatsu.

    - uprobes updates from Oleg Nesterov: tmpfs support, corner case
    fixes and robustization work.

    - perf tooling updates and fixes from Jiri Olsa, Namhyung Ki, Arnaldo
    et al:
    * Add support to accumulate hist periods (Namhyung Kim)
    * various fixes, refactorings and enhancements"

    * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (101 commits)
    perf: Differentiate exec() and non-exec() comm events
    perf: Fix perf_event_comm() vs. exec() assumption
    uprobes/x86: Rename arch_uprobe->def to ->defparam, minor comment updates
    perf/documentation: Add description for conditional branch filter
    perf/x86: Add conditional branch filtering support
    perf/tool: Add conditional branch filter 'cond' to perf record
    perf: Add new conditional branch filter 'PERF_SAMPLE_BRANCH_COND'
    uprobes: Teach copy_insn() to support tmpfs
    uprobes: Shift ->readpage check from __copy_insn() to uprobe_register()
    perf/x86: Use common PMU interrupt disabled code
    perf/ARM: Use common PMU interrupt disabled code
    perf: Disable sampled events if no PMU interrupt
    perf: Fix use after free in perf_remove_from_context()
    perf tools: Fix 'make help' message error
    perf record: Fix poll return value propagation
    perf tools: Move elide bool into perf_hpp_fmt struct
    perf tools: Remove elide setup for SORT_MODE__MEMORY mode
    perf tools: Fix "==" into "=" in ui_browser__warning assignment
    perf tools: Allow overriding sysfs and proc finding with env var
    perf tools: Consider header files outside perf directory in tags target
    ...

    Linus Torvalds
     
  • This adds a new vdso_test.c that's written entirely in C. It also
    makes all of the vDSO examples work on 32-bit x86.

    Cc: Stefani Seibold
    Signed-off-by: Andy Lutomirski
    Link: http://lkml.kernel.org/r/62b701fc44b79f118ac2b2d64d19965fc5c291fb.1402620737.git.luto@amacapital.net
    Signed-off-by: H. Peter Anvin

    Andy Lutomirski
     
  • This thing is hopelessly x86_64-specific: it's an example of how to
    access the vDSO without any runtime support at all.

    Signed-off-by: Andy Lutomirski
    Link: http://lkml.kernel.org/r/3efc170e0e166e15f0150c9fdb37d52488b9c0a4.1402620737.git.luto@amacapital.net
    Signed-off-by: H. Peter Anvin

    Andy Lutomirski
     
  • Pull more locking changes from Ingo Molnar:
    "This is the second round of locking tree updates for v3.16, offering
    large system scalability improvements:

    - optimistic spinning for rwsems, from Davidlohr Bueso.

    - 'qrwlocks' core code and x86 enablement, from Waiman Long and PeterZ"

    * 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86, locking/rwlocks: Enable qrwlocks on x86
    locking/rwlocks: Introduce 'qrwlocks' - fair, queued rwlocks
    locking/mutexes: Documentation update/rewrite
    locking/rwsem: Fix checkpatch.pl warnings
    locking/rwsem: Fix warnings for CONFIG_RWSEM_GENERIC_SPINLOCK
    locking/rwsem: Support optimistic spinning

    Linus Torvalds
     
  • Pull networking updates from David Miller:

    1) Seccomp BPF filters can now be JIT'd, from Alexei Starovoitov.

    2) Multiqueue support in xen-netback and xen-netfront, from Andrew J
    Benniston.

    3) Allow tweaking of aggregation settings in cdc_ncm driver, from Bjørn
    Mork.

    4) BPF now has a "random" opcode, from Chema Gonzalez.

    5) Add more BPF documentation and improve test framework, from Daniel
    Borkmann.

    6) Support TCP fastopen over ipv6, from Daniel Lee.

    7) Add software TSO helper functions and use them to support software
    TSO in mvneta and mv643xx_eth drivers. From Ezequiel Garcia.

    8) Support software TSO in fec driver too, from Nimrod Andy.

    9) Add Broadcom SYSTEMPORT driver, from Florian Fainelli.

    10) Handle broadcasts more gracefully over macvlan when there are large
    numbers of interfaces configured, from Herbert Xu.

    11) Allow more control over fwmark used for non-socket based responses,
    from Lorenzo Colitti.

    12) Do TCP congestion window limiting based upon measurements, from Neal
    Cardwell.

    13) Support busy polling in SCTP, from Neal Horman.

    14) Allow RSS key to be configured via ethtool, from Venkata Duvvuru.

    15) Bridge promisc mode handling improvements from Vlad Yasevich.

    16) Don't use inetpeer entries to implement ID generation any more, it
    performs poorly, from Eric Dumazet.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1522 commits)
    rtnetlink: fix userspace API breakage for iproute2 < v3.9.0
    tcp: fixing TLP's FIN recovery
    net: fec: Add software TSO support
    net: fec: Add Scatter/gather support
    net: fec: Increase buffer descriptor entry number
    net: fec: Factorize feature setting
    net: fec: Enable IP header hardware checksum
    net: fec: Factorize the .xmit transmit function
    bridge: fix compile error when compiling without IPv6 support
    bridge: fix smatch warning / potential null pointer dereference
    via-rhine: fix full-duplex with autoneg disable
    bnx2x: Enlarge the dorq threshold for VFs
    bnx2x: Check for UNDI in uncommon branch
    bnx2x: Fix 1G-baseT link
    bnx2x: Fix link for KR with swapped polarity lane
    sctp: Fix sk_ack_backlog wrap-around problem
    net/core: Add VF link state control policy
    net/fsl: xgmac_mdio is dependent on OF_MDIO
    net/fsl: Make xgmac_mdio read error message useful
    net_sched: drr: warn when qdisc is not work conserving
    ...

    Linus Torvalds
     
  • Pull more PCI updates from Bjorn Helgaas:
    "Here are some more things I'd like to see in v3.16-rc1:

    - DMA alias iterator, part of some work to fix IOMMU issues
    - MVEBU, Tegra, DesignWare changes that I forgot to include before
    - Some whitespace code cleanup

    Details:

    IOMMU
    - Add DMA alias iterator (Alex Williamson)
    - Add DMA alias quirks for ASMedia, ITE, Tundra bridges (Alex Williamson)
    - Add DMA alias quirks for Marvell, Ricoh devices (Alex Williamson)
    - Add DMA alias quirk for HighPoint devices (Jérôme Carretero)

    MSI
    - Fix leak in free_msi_irqs() (Alexei Starovoitov)

    Marvell MVEBU
    - Remove unnecessary use of 'conf_lock' spinlock (Andrew Murray)
    - Avoid setting an undefined window size (Jason Gunthorpe)
    - Allow several windows with the same target/attribute (Thomas Petazzoni)
    - Split PCIe BARs into multiple MBus windows when needed (Thomas Petazzoni)
    - Fix off-by-one in the computed size of the mbus windows (Willy Tarreau)

    NVIDIA Tegra
    - Use new OF interrupt mapping when possible (Lucas Stach)

    Synopsys DesignWare
    - Remove unnecessary use of 'conf_lock' spinlock (Andrew Murray)
    - Use new OF interrupt mapping when possible (Lucas Stach)
    - Split Exynos and i.MX bindings (Lucas Stach)
    - Fix comment for setting number of lanes (Mohit Kumar)
    - Fix iATU programming for cfg1, io and mem viewport (Mohit Kumar)

    Miscellaneous
    - EXPORT_SYMBOL cleanup (Ryan Desfosses)
    - Whitespace cleanup (Ryan Desfosses)
    - Merge multi-line quoted strings (Ryan Desfosses)"

    * tag 'pci-v3.16-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (21 commits)
    PCI: Add function 1 DMA alias quirk for HighPoint RocketRaid 642L
    PCI/MSI: Fix memory leak in free_msi_irqs()
    PCI: Merge multi-line quoted strings
    PCI: Whitespace cleanup
    PCI: Move EXPORT_SYMBOL so it immediately follows function/variable
    PCI: Add bridge DMA alias quirk for ITE bridge
    PCI: designware: Split Exynos and i.MX bindings
    PCI: Add bridge DMA alias quirk for ASMedia and Tundra bridges
    PCI: Add support for PCIe-to-PCI bridge DMA alias quirks
    PCI: Add function 1 DMA alias quirk for Marvell devices
    PCI: Add function 0 DMA alias quirk for Ricoh devices
    PCI: Add support for DMA alias quirks
    PCI: Convert pci_dev_flags definitions to bit shifts
    PCI: Add DMA alias iterator
    PCI: mvebu: Use '%pa' for printing 'phys_addr_t' type
    PCI: mvebu: Remove unnecessary use of 'conf_lock' spinlock
    PCI: designware: Remove unnecessary use of 'conf_lock' spinlock
    PCI: designware: Use new OF interrupt mapping when possible
    PCI: designware: Fix iATU programming for cfg1, io and mem viewport
    PCI: designware: Fix comment for setting number of lanes
    ...

    Linus Torvalds
     
  • Pull more ACPI and power management updates from Rafael Wysocki:
    "These are fixups on top of the previous PM+ACPI pull request,
    regression fixes (ACPI hotplug, cpufreq ppc-corenet), other bug fixes
    (ACPI reset, cpufreq), new PM trace points for system suspend
    profiling and a copyright notice update.

    Specifics:

    - I didn't remember correctly that the Hans de Goede's ACPI video
    patches actually didn't flip the video.use_native_backlight
    default, although we had discussed that and decided to do that.
    Since I said we would do that in the previous PM+ACPI pull request,
    make that change for real now.

    - ACPI bus check notifications for PCI host bridges don't cause the
    bus below the host bridge to be checked for changes as they should
    because of a mistake in the ACPI-based PCI hotplug (ACPIPHP)
    subsystem that forgets to add hotplug contexts to PCI host bridge
    ACPI device objects. Create hotplug contexts for PCI host bridges
    too as appropriate.

    - Revert recent cpufreq commit related to the big.LITTLE cpufreq
    driver that breaks arm64 builds.

    - Fix for a regression in the ppc-corenet cpufreq driver introduced
    during the 3.15 cycle and causing the driver to use the remainder
    from do_div instead of the quotient. From Ed Swarthout.

    - Resets triggered by panic activate a BUG_ON() in vmalloc.c on
    systems where the ACPI reset register is located in memory address
    space. Fix from Randy Wright.

    - Fix for a problem with cpufreq governors that decisions made by
    them may be suboptimal due to the fact that deferrable timers are
    used by them for CPU load sampling. From Srivatsa S Bhat.

    - Fix for a problem with the Tegra cpufreq driver where the CPU
    frequency is temporarily switched to a "stable" level that is
    different from both the initial and target frequencies during
    transitions which causes udelay() to expire earlier than it should
    sometimes. From Viresh Kumar.

    - New trace points and rework of some existing trace points for
    system suspend/resume profiling from Todd Brandt.

    - Assorted cpufreq fixes and cleanups from Stratos Karafotis and
    Viresh Kumar.

    - Copyright notice update for suspend-and-cpuhotplug.txt from
    Srivatsa S Bhat"

    * tag 'pm+acpi-3.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
    ACPI / hotplug / PCI: Add hotplug contexts to PCI host bridges
    PM / sleep: trace events for device PM callbacks
    cpufreq: cpufreq-cpu0: remove dependency on THERMAL and REGULATOR
    cpufreq: tegra: update comment for clarity
    cpufreq: intel_pstate: Remove duplicate CPU ID check
    cpufreq: Mark CPU0 driver with CPUFREQ_NEED_INITIAL_FREQ_CHECK flag
    PM / Documentation: Update copyright in suspend-and-cpuhotplug.txt
    cpufreq: governor: remove copy_prev_load from 'struct cpu_dbs_common_info'
    cpufreq: governor: Be friendly towards latency-sensitive bursty workloads
    PM / sleep: trace events for suspend/resume
    cpufreq: ppc-corenet-cpu-freq: do_div use quotient
    Revert "cpufreq: Enable big.LITTLE cpufreq driver on arm64"
    cpufreq: Tegra: implement intermediate frequency callbacks
    cpufreq: add support for intermediate (stable) frequencies
    ACPI / video: Change the default for video.use_native_backlight to 1
    ACPI: Fix bug when ACPI reset register is implemented in system memory

    Linus Torvalds
     
  • Pull LED updates from Bryan Wu:
    "I just found merge window is open and I'm quite busy and almost forget
    to send out this pull request. Thanks Russell and Alexandre ping me
    about this.

    So basically we got some clean up and leds-pwm fixing patches from
    Russell"

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
    leds: Remove duplicated OOM message for individual driver
    drivers/leds: Replace __get_cpu_var use through this_cpu_ptr
    leds: lp55xx: add DT bindings for LP55231
    leds: 88pm860x: Fix missing refcount decrement for parent of_node
    leds: 88pm860x: Use of_get_child_by_name
    leds: leds-pwm: add DT support for LEDs wired to supply
    leds: leds-pwm: implement PWM inversion
    leds: leds-pwm: convert OF parsing code to use led_pwm_add()
    leds: leds-pwm: provide a common function to setup a single led-pwm device
    leds: pca9685: Remove leds-pca9685 driver
    dell-led: add mic mute led interface

    Linus Torvalds
     
  • Pull more MFD updates from Lee Jones:
    "I missed collecting these patches due to a branch/tag naming
    ambiguity. Completely my own fault, as I mindlessly named a branch
    and tag identically. Sorry for the fuss.

    This pull-request contains some misplaced patches from Tony Lindgren
    that should have been part of the initial one"

    * tag 'mfd-for-linus-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
    mfd: twl4030-power: Add a configuration to turn off oscillator during off-idle
    mfd: twl4030-power: Add support for board specific configuration
    mfd: twl4030-power: Add recommended idle configuration
    mfd: twl4030-power: Add generic reset configuration
    mfd: twl4030-power: Fix some defines for SW_EVENTS
    mfd: twl4030-power: Fix hang on reboot if sleep configuration was loaded earlier

    Linus Torvalds
     
  • Pull drm updates from Dave Airlie:
    "This is the main drm merge window pull request, changes all over the
    place, mostly normal levels of churn.

    Highlights:

    Core drm:
    More cleanups, fix race on connector/encoder naming, docs updates,
    object locking rework in prep for atomic modeset

    i915:
    mipi DSI support, valleyview power fixes, cursor size fixes,
    execlist refactoring, vblank improvements, userptr support, OOM
    handling improvements

    radeon:
    GPUVM tuning and large page size support, gart fixes, deep color
    HDMI support, HDMI audio cleanups

    nouveau:
    - displayport rework should fix lots of issues
    - initial gk20a support
    - gk110b support
    - gk208 fixes

    exynos:
    probe order fixes, HDMI changes, IPP consolidation

    msm:
    debugfs updates, misc fixes

    ast:
    ast2400 support, sync with UMS driver

    tegra:
    cleanups, hdmi + hw cursor for Tegra 124.

    panel:
    fixes existing panels add some new ones.

    ipuv3:
    moved from staging to drivers/gpu"

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (761 commits)
    drm/nouveau/disp/dp: fix tmds passthrough on dp connector
    drm/nouveau/dp: probe dpcd to determine connectedness
    drm/nv50-: trigger update after all connectors disabled
    drm/nv50-: prepare for attaching a SOR to multiple heads
    drm/gf119-/disp: fix debug output on update failure
    drm/nouveau/disp/dp: make use of postcursor when its available
    drm/g94-/disp/dp: take max pullup value across all lanes
    drm/nouveau/bios/dp: parse lane postcursor data
    drm/nouveau/dp: fix support for dpms
    drm/nouveau: register a drm_dp_aux channel for each dp connector
    drm/g94-/disp: add method to power-off dp lanes
    drm/nouveau/disp/dp: maintain link in response to hpd signal
    drm/g94-/disp: bash and wait for something after changing lane power regs
    drm/nouveau/disp/dp: split link config/power into two steps
    drm/nv50/disp: train PIOR-attached DP from second supervisor
    drm/nouveau/disp/dp: make use of existing output data for link training
    drm/gf119/disp: start removing direct vbios parsing from supervisor
    drm/nv50/disp: start removing direct vbios parsing from supervisor
    drm/nouveau/disp/dp: maintain receiver caps in response to hpd signal
    drm/nouveau/disp/dp: create subclass for dp outputs
    ...

    Linus Torvalds
     
  • Pull vfs updates from Al Viro:
    "This the bunch that sat in -next + lock_parent() fix. This is the
    minimal set; there's more pending stuff.

    In particular, I really hope to get acct.c fixes merged this cycle -
    we need that to deal sanely with delayed-mntput stuff. In the next
    pile, hopefully - that series is fairly short and localized
    (kernel/acct.c, fs/super.c and fs/namespace.c). In this pile: more
    iov_iter work. Most of prereqs for ->splice_write with sane locking
    order are there and Kent's dio rewrite would also fit nicely on top of
    this pile"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (70 commits)
    lock_parent: don't step on stale ->d_parent of all-but-freed one
    kill generic_file_splice_write()
    ceph: switch to iter_file_splice_write()
    shmem: switch to iter_file_splice_write()
    nfs: switch to iter_splice_write_file()
    fs/splice.c: remove unneeded exports
    ocfs2: switch to iter_file_splice_write()
    ->splice_write() via ->write_iter()
    bio_vec-backed iov_iter
    optimize copy_page_{to,from}_iter()
    bury generic_file_aio_{read,write}
    lustre: get rid of messing with iovecs
    ceph: switch to ->write_iter()
    ceph_sync_direct_write: stop poking into iov_iter guts
    ceph_sync_read: stop poking into iov_iter guts
    new helper: copy_page_from_iter()
    fuse: switch to ->write_iter()
    btrfs: switch to ->write_iter()
    ocfs2: switch to ->write_iter()
    xfs: switch to ->write_iter()
    ...

    Linus Torvalds
     

12 Jun, 2014

8 commits

  • Add support for Sensirion SHTC1 and compatible temperature and humidity
    sensors.

    Signed-off-by: Tomas Pop
    Signed-off-by: Guenter Roeck

    Tomas Pop
     
  • * pm-cpufreq:
    cpufreq: cpufreq-cpu0: remove dependency on THERMAL and REGULATOR
    cpufreq: tegra: update comment for clarity
    cpufreq: intel_pstate: Remove duplicate CPU ID check
    cpufreq: Mark CPU0 driver with CPUFREQ_NEED_INITIAL_FREQ_CHECK flag
    cpufreq: governor: remove copy_prev_load from 'struct cpu_dbs_common_info'
    cpufreq: governor: Be friendly towards latency-sensitive bursty workloads
    cpufreq: ppc-corenet-cpu-freq: do_div use quotient
    Revert "cpufreq: Enable big.LITTLE cpufreq driver on arm64"
    cpufreq: Tegra: implement intermediate frequency callbacks
    cpufreq: add support for intermediate (stable) frequencies

    Rafael J. Wysocki
     
  • Backmerge of dcache.c changes from mainline. It's that, or complete
    rebase...

    Conflicts:
    fs/splice.c

    Signed-off-by: Al Viro

    Al Viro
     
  • Pull module updates from Rusty Russell:
    "Most of this is cleaning up various driver sysfs permissions so we can
    re-add the perm check (we unified the module param and sysfs checks,
    but the module ones were stronger so we weakened them temporarily).

    Param parsing gets documented, and also "--" now forces args to be
    handed to init (and ignored by the kernel).

    Module NX/RO protections get tightened: we now set them before calling
    parse_args()"

    * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
    module: set nx before marking module MODULE_STATE_COMING.
    samples/kobject/: avoid world-writable sysfs files.
    drivers/hid/hid-picolcd_fb: avoid world-writable sysfs files.
    drivers/staging/speakup/: avoid world-writable sysfs files.
    drivers/regulator/virtual: avoid world-writable sysfs files.
    drivers/scsi/pm8001/pm8001_ctl.c: avoid world-writable sysfs files.
    drivers/hid/hid-lg4ff.c: avoid world-writable sysfs files.
    drivers/video/fbdev/sm501fb.c: avoid world-writable sysfs files.
    drivers/mtd/devices/docg3.c: avoid world-writable sysfs files.
    speakup: fix incorrect perms on speakup_acntsa.c
    cpumask.h: silence warning with -Wsign-compare
    Documentation: Update kernel-parameters.tx
    param: hand arguments after -- straight to init
    modpost: Fix resource leak in read_dump()

    Linus Torvalds
     
  • This patch adds a description of eBPFs instruction encoding in order
    to bring the documentation in line with the implementation.

    Signed-off-by: Alexei Starovoitov
    Signed-off-by: Daniel Borkmann
    Signed-off-by: David S. Miller

    Alexei Starovoitov
     
  • Since the term eBPF is used anyway on mailing list discussions, lets
    also document that in the main BPF documentation file and replace a
    couple of occurrences with eBPF terminology to be more clear.

    Signed-off-by: Alexei Starovoitov
    Signed-off-by: Daniel Borkmann
    Signed-off-by: David S. Miller

    Alexei Starovoitov
     
  • Pull thermal management update from Zhang Rui:
    "Specifics:

    - fix a bug in Exynos thermal driver, which overwrites the hardware
    trip point threshold when updating software trigger levels and
    results in emergency shutdown. From: Tushar Behera.

    - add thermal sensor support for Armada 375 and 38x SoCs. From
    Ezequiel Garcia.

    - add TMU (Thermal Management Unit) support for Exynos5260 and
    Exynos5420 SoCs. From Naveen Krishna Chatradhi.

    - add support for the additional digital temperature sensors in the
    Intel SoCs like Bay Trail. From: Srinivas Pandruvada.

    - a couple of cleanups and small fixes from Jingoo Han, Bartlomiej
    Zolnierkiewicz, Geert Uytterhoeven, Jacob Pan, Paul Walmsley and
    Lan,Tianyu"

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (21 commits)
    thermal: spear: remove unnecessary OOM messages
    thermal: exynos: remove unnecessary OOM messages
    thermal: rcar: remove unnecessary OOM messages
    thermal: armada: Support Armada 380 SoC
    thermal: armada: Support Armada 375 SoC
    thermal: armada: Allow to specify an 'inverted readout' sensor
    thermal: armada: Pass the platform_device to init_sensor()
    thermal: armada: Add generic infrastructure to handle the sensor
    thermal: armada: Add infrastructure to support generic formulas
    thermal: armada: Rename armada_thermal_ops struct
    thermal/intel_powerclamp: add newer cpu ids
    thermal: rcar: Use pm_runtime_put() i.s.o. pm_runtime_put_sync()
    thermal: samsung: Only update available threshold limits
    Thermal/int3403: Fix thermal hysteresis unit conversion
    thermal: Intel SoC DTS thermal
    thermal: samsung: Add TMU support for Exynos5260 SoCs
    thermal: samsung: Add TMU support for Exynos5420 SoCs
    thermal: samsung: change base_common to more meaningful base_second
    thermal: samsung: replace inten_ bit fields with intclr_
    thermal: offer Samsung thermal support only when ARCH_EXYNOS is defined
    ...

    Linus Torvalds
     
  • …ierry.reding/linux-pwm

    Pull pwm changes from Thierry Reding:
    "The majority of these changes are cleanups and fixes across all
    drivers. Redundant error messages are removed and more PWM
    controllers set the .can_sleep flag to signal that they can't be used
    in atomic context.

    Support is added for the Broadcom Kona family of SoCs and the Intel
    LPSS driver can now probe PCI devices in addition to ACPI devices.
    Upon shutdown, the pwm-backlight driver will now power off the
    backlight. It also uses the new descriptor-based GPIO API for more
    concise GPIO handling.

    A large chunk of these changes also converts platforms to use the
    lookup mechanism rather than relying on the global number space to
    reference PWM devices. This is largely in preparation for more
    unification and cleanups in future patches. Eventually it will allow
    the legacy PWM API to be removed"

    * tag 'pwm/for-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (38 commits)
    pwm: fsl-ftm: set pwm_chip can_sleep flag
    pwm: ab8500: Fix wrong value shift for disable/enable PWM
    pwm: samsung: do not set manual update bit in pwm_samsung_config
    pwm: lp3943: Set pwm_chip can_sleep flag
    pwm: atmel: set pwm_chip can_sleep flag
    pwm: mxs: set pwm_chip can_sleep flag
    pwm: tiehrpwm: inline accessor functions
    pwm: tiehrpwm: don't build PM related functions when not needed
    pwm-backlight: retrieve configured PWM period
    leds: leds-pwm: retrieve configured PWM period
    ARM: pxa: hx4700: use PWM_LOOKUP to initialize struct pwm_lookup
    ARM: shmobile: armadillo: use PWM_LOOKUP to initialize struct pwm_lookup
    ARM: OMAP3: Beagle: use PWM_LOOKUP to initialize struct pwm_lookup
    pwm: modify PWM_LOOKUP to initialize all struct pwm_lookup members
    ARM: pxa: hx4700: initialize all the struct pwm_lookup members
    ARM: OMAP3: Beagle: initialize all the struct pwm_lookup members
    pwm: renesas-tpu: remove unused struct tpu_pwm_platform_data
    ARM: shmobile: armadillo: initialize all struct pwm_lookup members
    pwm: add period and polarity to struct pwm_lookup
    pwm: twl: Really disable twl6030 PWMs
    ...

    Linus Torvalds
     

11 Jun, 2014

14 commits

  • Pull MTD updates from Brian Norris:
    - refactor m25p80.c driver for use as a general SPI NOR framework for
    other drivers which may speak to SPI NOR flash without providing full
    SPI support (i.e., not part of drivers/spi/)
    - new Freescale QuadSPI driver (utilizing new SPI NOR framework)
    - updates for the STMicro "FSM" SPI NOR driver
    - fix sync/flush behavior on mtd_blkdevs
    - fixup subpage write support on a few NAND drivers
    - correct the MTD OOB test for odd-sized OOB areas
    - add BCH-16 support for OMAP NAND
    - fix warnings and trivial refactoring
    - utilize new ECC DT bindings in pxa3xx NAND driver
    - new LPDDR NVM driver
    - address a few assorted bugs caught by Coverity
    - add new imx6sx support for GPMI NAND
    - use a bounce buffer for NAND when non-DMA-able buffers are used

    * tag 'for-linus-20140610' of git://git.infradead.org/linux-mtd: (77 commits)
    mtd: gpmi: add gpmi support for imx6sx
    mtd: maps: remove check for CONFIG_MTD_SUPERH_RESERVE
    mtd: bf5xx_nand: use the managed version of kzalloc
    mtd: pxa3xx_nand: make the driver work on big-endian systems
    mtd: nand: omap: fix omap_calculate_ecc_bch() for-loop error
    mtd: nand: r852: correct write_buf loop bounds
    mtd: nand_bbt: handle error case for nand_create_badblock_pattern()
    mtd: nand_bbt: remove unused variable
    mtd: maps: sc520cdp: fix warnings
    mtd: slram: fix unused variable warning
    mtd: pfow: remove unused variable
    mtd: lpddr: fix Kconfig dependency, for I/O accessors
    mtd: nand: pxa3xx: Add supported ECC strength and step size to the DT binding
    mtd: nand: pxa3xx: Use ECC strength and step size devicetree binding
    mtd: nand: pxa3xx: Clean pxa_ecc_init() error handling
    mtd: nand: Warn the user if the selected ECC strength is too weak
    mtd: nand: omap: Documentation: How to select correct ECC scheme for your device ?
    mtd: nand: omap: add support for BCH16_ECC - NAND driver updates
    mtd: nand: omap: add support for BCH16_ECC - ELM driver updates
    mtd: nand: omap: add support for BCH16_ECC - GPMC driver updates
    ...

    Linus Torvalds
     
  • Document new compatible strings for clock provided by the PRCM
    (Power/Reset/Clock Management) unit.

    Signed-off-by: Boris BREZILLON
    Signed-off-by: Emilio López

    Boris BREZILLON
     
  • Support for the USB gates and resets on A31 has been recently added
    using a new compatible, so let's document it here.

    Signed-off-by: Emilio López

    Emilio López
     
  • The macro 'A' used in internal BPF interpreter:
    #define A regs[insn->a_reg]
    was easily confused with the name of classic BPF register 'A', since
    'A' would mean two different things depending on context.

    This patch is trying to clean up the naming and clarify its usage in the
    following way:

    - A and X are names of two classic BPF registers

    - BPF_REG_A denotes internal BPF register R0 used to map classic register A
    in internal BPF programs generated from classic

    - BPF_REG_X denotes internal BPF register R7 used to map classic register X
    in internal BPF programs generated from classic

    - internal BPF instruction format:
    struct sock_filter_int {
    __u8 code; /* opcode */
    __u8 dst_reg:4; /* dest register */
    __u8 src_reg:4; /* source register */
    __s16 off; /* signed offset */
    __s32 imm; /* signed immediate constant */
    };

    - BPF_X/BPF_K is 1 bit used to encode source operand of instruction
    In classic:
    BPF_X - means use register X as source operand
    BPF_K - means use 32-bit immediate as source operand
    In internal:
    BPF_X - means use 'src_reg' register as source operand
    BPF_K - means use 32-bit immediate as source operand

    Suggested-by: Chema Gonzalez
    Signed-off-by: Alexei Starovoitov
    Acked-by: Daniel Borkmann
    Acked-by: Chema Gonzalez
    Signed-off-by: David S. Miller

    Alexei Starovoitov
     
  • Pull watchdog updates from Wim Van Sebroeck:
    "This contains:
    - addition of the Intel MID watchdog
    - removal of W83697HF and W83697UG drivers (code was merged into
    w83627hf_wdt driver)
    - addition of Armada 375/380 SoC support
    - conversion of imx2_wdt to regmap API and to watchdog core API
    - lots of other small improvements and fixes"

    [ Wim was also tagged by gmail as a spammer, but not delayed by days
    unlike Ben ]

    * git://www.linux-watchdog.org/linux-watchdog: (25 commits)
    x86: intel-mid: add watchdog platform code for Merrifield
    watchdog: add Intel MID watchdog driver support
    watchdog: sp805: Set watchdog_device->timeout from ->set_timeout()
    booke/watchdog: refine and clean up the codes
    watchdog: iop_wdt only builds for mach-iop13xx
    watchdog: Remove drivers for W83697HF and W83697UG
    watchdog: w83627hf_wdt: Add early_disable module parameter
    ARM: mvebu: Add A375/A380 watchdog binding documentation
    watchdog: orion: Add Armada 375/380 SoC support
    watchdog: orion: Introduce per-SoC enabled() function
    watchdog: orion: Introduce per-SoC stop() function
    watchdog: orion: Remove unneeded atomic access
    watchdog: orion: Introduce a SoC-specific RSTOUT mapping
    watchdog: orion: Move the register ioremap'ing to its own function
    watchdog: xilinx: Make of_device_id array const
    watchdog: imx2_wdt: convert to watchdog core api
    watchdog: imx2_wdt: convert to use regmap API.
    watchdog: imx2_wdt: Sort the header files alphabetically
    watchdog: ath79_wdt: switch to clk_prepare/clk_disable
    watchdog: ath79_wdt: avoid spurious restarts on AR934x
    ...

    Linus Torvalds
     
  • Pull powerpc updates from Ben Herrenschmidt:
    "Here is the bulk of the powerpc changes for this merge window. It got
    a bit delayed in part because I wasn't paying attention, and in part
    because I discovered I had a core PCI change without a PCI maintainer
    ack in it. Bjorn eventually agreed it was ok to merge it though we'll
    probably improve it later and I didn't want to rebase to add his ack.

    There is going to be a bit more next week, essentially fixes that I
    still want to sort through and test.

    The biggest item this time is the support to build the ppc64 LE kernel
    with our new v2 ABI. We previously supported v2 userspace but the
    kernel itself was a tougher nut to crack. This is now sorted mostly
    thanks to Anton and Rusty.

    We also have a fairly big series from Cedric that add support for
    64-bit LE zImage boot wrapper. This was made harder by the fact that
    traditionally our zImage wrapper was always 32-bit, but our new LE
    toolchains don't really support 32-bit anymore (it's somewhat there
    but not really "supported") so we didn't want to rely on it. This
    meant more churn that just endian fixes.

    This brings some more LE bits as well, such as the ability to run in
    LE mode without a hypervisor (ie. under OPAL firmware) by doing the
    right OPAL call to reinitialize the CPU to take HV interrupts in the
    right mode and the usual pile of endian fixes.

    There's another series from Gavin adding EEH improvements (one day we
    *will* have a release with less than 20 EEH patches, I promise!).

    Another highlight is the support for the "Split core" functionality on
    P8 by Michael. This allows a P8 core to be split into "sub cores" of
    4 threads which allows the subcores to run different guests under KVM
    (the HW still doesn't support a partition per thread).

    And then the usual misc bits and fixes ..."

    [ Further delayed by gmail deciding that BenH is a dirty spammer.
    Google knows. ]

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (155 commits)
    powerpc/powernv: Add missing include to LPC code
    selftests/powerpc: Test the THP bug we fixed in the previous commit
    powerpc/mm: Check paca psize is up to date for huge mappings
    powerpc/powernv: Pass buffer size to OPAL validate flash call
    powerpc/pseries: hcall functions are exported to modules, need _GLOBAL_TOC()
    powerpc: Exported functions __clear_user and copy_page use r2 so need _GLOBAL_TOC()
    powerpc/powernv: Set memory_block_size_bytes to 256MB
    powerpc: Allow ppc_md platform hook to override memory_block_size_bytes
    powerpc/powernv: Fix endian issues in memory error handling code
    powerpc/eeh: Skip eeh sysfs when eeh is disabled
    powerpc: 64bit sendfile is capped at 2GB
    powerpc/powernv: Provide debugfs access to the LPC bus via OPAL
    powerpc/serial: Use saner flags when creating legacy ports
    powerpc: Add cpu family documentation
    powerpc/xmon: Fix up xmon format strings
    powerpc/powernv: Add calls to support little endian host
    powerpc: Document sysfs DSCR interface
    powerpc: Fix regression of per-CPU DSCR setting
    powerpc: Split __SYSFS_SPRSETUP macro
    arch: powerpc/fadump: Cleaning up inconsistent NULL checks
    ...

    Linus Torvalds
     
  • Pull x86 platform driver updates from Matthew Garrett:
    "Very little of excitement here - the most significant is a new driver
    for detecting device freefall on Dells, other than that it's pretty
    much entirely minor fixes for specific machines"

    * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
    hp-wmi: Enable hotkeys on some systems
    thinkpad_acpi: Add mappings for F9 - F12 hotkeys on X240 / T440 / T540
    platform: x86: dell-smo8800: Dell Latitude freefall driver (ACPI SMO8800/SMO8810)
    ideapad_laptop: Introduce the use of the managed version of kzalloc
    platform/x86: Fix run-time dependencies of OLPC drivers
    platform: x86: asus-wmi.c: Cleaning up uninitialized variables
    ix86/mid/thermal: Introduce the use of the managed version of kzalloc
    platform x86 Kconfig: Refer to the laptop list in the Compal driver help
    Documentation: Add list of laptop models supported by the Compal driver
    ideapad-laptop: Blacklist rfkill control on the Lenovo Yoga 2 11
    asus-wmi: Set WAPF to 4 for Asus X550CA
    alienware-wmi: For WMAX HDMI method, introduce a way to query HDMI cable status
    alienware-wmi: Update WMAX brightness method limit to 15
    pvpanic: Set high notifier priority
    platform/x86: samsung-laptop: Add support for Samsung's NP7[34]0U3E models.
    toshiba_acpi: Add alternative keymap support for Satellite M840
    platform-drivers-x86: intel_pmic_gpio: Fix off-by-one valid offset range check

    Linus Torvalds
     
  • Mike Turquette
     
  • Signed-off-by: Ismael Luceno
    Signed-off-by: Matthew Garrett

    Ismael Luceno
     
  • Pull MMC update from Chris Ball:
    "MMC highlights for 3.16:

    Core:
    - support HS400 mode of eMMC 5.0, via DT bindings mmc-hs400-1_{2,8}v
    - if card init at 3.3v doesn't work, try 1.8v and 1.2v too

    Drivers:
    - moxart: New driver for MOXA ART SoCs
    - rtsx_usb_sdmmc: New driver for Realtek USB card readers
    - sdhci: Large rework around IRQ/regulator handling, remove card_tasklet
    - sdhci-pci-o2micro: Add SeaBird SeaEagle SD3 support
    - sunxi: New driver for Allwinner sunxi SoCs
    - usdhi6rol0: New driver for Renesas SD/SDIO controller"

    * tag 'mmc-updates-for-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (95 commits)
    mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet
    mmc: add a driver for the Renesas usdhi6rol0 SD/SDIO host controller
    mmc: sdhci-of-esdhc: Fixup compile error
    mmc: tegra: fix reporting of base clock frequency
    mmc: tegra: disable UHS modes
    mmc: sdhci-dove: use mmc_of_parse() and remove card_tasklet CD handler
    MAINTAINERS: mmc: Add path to git tree
    mmc: dove: fix missing MACH_DOVE dependency
    mmc: sdhci: SD tuning is broken for some controllers
    mmc: sdhci-esdhc-imx: fix mmc ddr mode regression issue
    mmc: sdhci-pci-o2micro: Add SeaBird SeaEagle SD3 support
    mmc: omap_hsmmc: split omap-dma header file
    mmc: omap_hsmmc: fix cmd23 multiblock read/write
    mmc: omap_hsmmc: use devm_ioremap_resource
    mmc: omap_hsmmc: use devm_request_threaded_irq
    mmc: omap_hsmmc: use devm_request_irq
    mmc: omap_hsmmc: use devm_clk_get
    mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi SoCs
    mmc: wmt-sdmmc: Use GFP_KERNEL instead of hard-coded value
    mmc: omap: Use DIV_ROUND_UP instead of open coded
    ...

    Linus Torvalds
     
  • This commit documents the new support for "marvell,armada-{375,380}-wdt"
    compatible strings and the extra 'reg' entry requirement.

    Signed-off-by: Ezequiel Garcia
    Reviewed-by: Guenter Roeck
    Acked-by: Jason Cooper
    Signed-off-by: Wim Van Sebroeck

    Ezequiel Garcia
     
  • Pull nfsd updates from Bruce Fields:
    "The largest piece is a long-overdue rewrite of the xdr code to remove
    some annoying limitations: for example, there was no way to return
    ACLs larger than 4K, and readdir results were returned only in 4k
    chunks, limiting performance on large directories.

    Also:
    - part of Neil Brown's work to make NFS work reliably over the
    loopback interface (so client and server can run on the same
    machine without deadlocks). The rest of it is coming through
    other trees.
    - cleanup and bugfixes for some of the server RDMA code, from
    Steve Wise.
    - Various cleanup of NFSv4 state code in preparation for an
    overhaul of the locking, from Jeff, Trond, and Benny.
    - smaller bugfixes and cleanup from Christoph Hellwig and
    Kinglong Mee.

    Thanks to everyone!

    This summer looks likely to be busier than usual for knfsd. Hopefully
    we won't break it too badly; testing definitely welcomed"

    * 'for-3.16' of git://linux-nfs.org/~bfields/linux: (100 commits)
    nfsd4: fix FREE_STATEID lockowner leak
    svcrdma: Fence LOCAL_INV work requests
    svcrdma: refactor marshalling logic
    nfsd: don't halt scanning the DRC LRU list when there's an RC_INPROG entry
    nfs4: remove unused CHANGE_SECURITY_LABEL
    nfsd4: kill READ64
    nfsd4: kill READ32
    nfsd4: simplify server xdr->next_page use
    nfsd4: hash deleg stateid only on successful nfs4_set_delegation
    nfsd4: rename recall_lock to state_lock
    nfsd: remove unneeded zeroing of fields in nfsd4_proc_compound
    nfsd: fix setting of NFS4_OO_CONFIRMED in nfsd4_open
    nfsd4: use recall_lock for delegation hashing
    nfsd: fix laundromat next-run-time calculation
    nfsd: make nfsd4_encode_fattr static
    SUNRPC/NFSD: Remove using of dprintk with KERN_WARNING
    nfsd: remove unused function nfsd_read_file
    nfsd: getattr for FATTR4_WORD0_FILES_AVAIL needs the statfs buffer
    NFSD: Error out when getting more than one fsloc/secinfo/uuid
    NFSD: Using type of uint32_t for ex_nflavors instead of int
    ...

    Linus Torvalds
     
  • Pull slave-dmaengine updates from Vinod Koul:
    - new Xilixn VDMA driver from Srikanth
    - bunch of updates for edma driver by Thomas, Joel and Peter
    - fixes and updates on dw, ste_dma, freescale, mpc512x, sudmac etc

    * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (45 commits)
    dmaengine: sh: don't use dynamic static allocation
    dmaengine: sh: fix print specifier warnings
    dmaengine: sh: make shdma_prep_dma_cyclic static
    dmaengine: Kconfig: Update MXS_DMA help text to include MX6Q/MX6DL
    of: dma: Grammar s/requests/request/, s/used required/required/
    dmaengine: shdma: Enable driver compilation with COMPILE_TEST
    dmaengine: rcar-hpbdma: Include linux/err.h
    dmaengine: sudmac: Include linux/err.h
    dmaengine: sudmac: Keep #include sorted alphabetically
    dmaengine: shdmac: Include linux/err.h
    dmaengine: shdmac: Keep #include sorted alphabetically
    dmaengine: s3c24xx-dma: Add cyclic transfer support
    dmaengine: s3c24xx-dma: Process whole SG chain
    dmaengine: imx: correct sdmac->status for cyclic dma tx
    dmaengine: pch: fix compilation for alpha target
    dmaengine: dw: check return code of dma_async_device_register()
    dmaengine: dw: fix regression in dw_probe() function
    dmaengine: dw: enable clock before access
    dma: pch_dma: Fix Kconfig dependencies
    dmaengine: mpc512x: add support for peripheral transfers
    ...

    Linus Torvalds
     
  • Pull security layer updates from Serge Hallyn:
    "This is a merge of James Morris' security-next tree from 3.14 to
    yesterday's master, plus four patches from Paul Moore which are in
    linux-next, plus one patch from Mimi"

    * 'serge-next-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux-security:
    ima: audit log files opened with O_DIRECT flag
    selinux: conditionally reschedule in hashtab_insert while loading selinux policy
    selinux: conditionally reschedule in mls_convert_context while loading selinux policy
    selinux: reject setexeccon() on MNT_NOSUID applications with -EACCES
    selinux: Report permissive mode in avc: denied messages.
    Warning in scanf string typing
    Smack: Label cgroup files for systemd
    Smack: Verify read access on file open - v3
    security: Convert use of typedef ctl_table to struct ctl_table
    Smack: bidirectional UDS connect check
    Smack: Correctly remove SMACK64TRANSMUTE attribute
    SMACK: Fix handling value==NULL in post setxattr
    bugfix patch for SMACK
    Smack: adds smackfs/ptrace interface
    Smack: unify all ptrace accesses in the smack
    Smack: fix the subject/object order in smack_ptrace_traceme()
    Minor improvement of 'smack_sb_kern_mount'
    smack: fix key permission verification
    KEYS: Move the flags representing required permission to linux/key.h

    Linus Torvalds
     

10 Jun, 2014

3 commits

  • Signed-off-by: Warren Turkal
    Acked-by: Randy Dunlap
    Signed-off-by: Michal Marek

    Warren Turkal
     
  • Pull f2fs updates from Jaegeuk Kim:
    "In this round, there is no special interesting feature, but we've
    investigated a couple of tuning points with respect to the I/O flow.
    Several major bug fixes and a bunch of clean-ups also have been made.

    This patch-set includes the following major enhancement patches:
    - enhance wait_on_page_writeback
    - support SEEK_DATA and SEEK_HOLE
    - enhance readahead flows
    - enhance IO flushes
    - support fiemap
    - add some tracepoints

    The other bug fixes are as follows:
    - fix to support a large volume > 2TB correctly
    - recovery bug fix wrt fallocated space
    - fix recursive lock on xattr operations
    - fix some cases on the remount flow

    And, there are a bunch of cleanups"

    * tag 'for-f2fs-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (52 commits)
    f2fs: support f2fs_fiemap
    f2fs: avoid not to call remove_dirty_inode
    f2fs: recover fallocated space
    f2fs: fix to recover data written by dio
    f2fs: large volume support
    f2fs: avoid crash when trace f2fs_submit_page_mbio event in ra_sum_pages
    f2fs: avoid overflow when large directory feathure is enabled
    f2fs: fix recursive lock by f2fs_setxattr
    MAINTAINERS: add a co-maintainer from samsung for F2FS
    MAINTAINERS: change the email address for f2fs
    f2fs: use inode_init_owner() to simplify codes
    f2fs: avoid to use slab memory in f2fs_issue_flush for efficiency
    f2fs: add a tracepoint for f2fs_read_data_page
    f2fs: add a tracepoint for f2fs_write_{meta,node,data}_pages
    f2fs: add a tracepoint for f2fs_write_{meta,node,data}_page
    f2fs: add a tracepoint for f2fs_write_end
    f2fs: add a tracepoint for f2fs_write_begin
    f2fs: fix checkpatch warning
    f2fs: deactivate inode page if the inode is evicted
    f2fs: decrease the lock granularity during write_begin
    ...

    Linus Torvalds
     
  • Pull SCSI updates from James Bottomley:
    "This patch consists of the usual driver updates (qla2xxx, qla4xxx,
    lpfc, be2iscsi, fnic, ufs, NCR5380) The NCR5380 is the addition to
    maintained status of a long neglected driver for older hardware. In
    addition there are a lot of minor fixes and cleanups and some more
    updates to make scsi mq ready"

    * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (130 commits)
    include/scsi/osd_protocol.h: remove unnecessary __constant
    mvsas: Recognise device/subsystem 9485/9485 as 88SE9485
    Revert "be2iscsi: Fix processing cqe for cxn whose endpoint is freed"
    mptfusion: fix msgContext in mptctl_hp_hostinfo
    acornscsi: remove linked command support
    scsi/NCR5380: dprintk macro
    fusion: Remove use of DEF_SCSI_QCMD
    fusion: Add free msg frames to the head, not tail of list
    mpt2sas: Add free smids to the head, not tail of list
    mpt2sas: Remove use of DEF_SCSI_QCMD
    mpt2sas: Remove uses of serial_number
    mpt3sas: Remove use of DEF_SCSI_QCMD
    mpt3sas: Remove uses of serial_number
    qla2xxx: Use kmemdup instead of kmalloc + memcpy
    qla4xxx: Use kmemdup instead of kmalloc + memcpy
    qla2xxx: fix incorrect debug printk
    be2iscsi: Bump the driver version
    be2iscsi: Fix processing cqe for cxn whose endpoint is freed
    be2iscsi: Fix destroy MCC-CQ before MCC-EQ is destroyed
    be2iscsi: Fix memory corruption in MBX path
    ...

    Linus Torvalds