1. 20 5月, 2016 30 次提交
  2. 19 5月, 2016 10 次提交
    • L
      Merge tag 'trace-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 2600a46e
      Linus Torvalds 提交于
      Pull tracing updates from Steven Rostedt:
       "This includes two new updates for the ftrace infrastructure.
      
         - With the changing of the code for filtering events by pid, from a
           list of pids to a bitmask, we can now easily implement following
           forks.  With a new tracing option "event-fork" which, when set,
           will have tasks with pids in set_event_pid, when they fork, to have
           their child pids added to set_event_pid and the child will be
           traced as well.
      
           Note, if "event-fork" is set and a task with its pid in
           set_event_pid exits, its pid will be removed from set_event_pid
      
         - The addition of Tom Zanussi's hist triggers.  This includes a very
           thorough documentatino on how to use the hist triggers with events.
           This introduces a quick and easy way to get histogram data from
           events and their fields.
      
        Some other cleanups and updates were added as well.  Like Masami
        Hiramatsu added test cases for the event trigger and hist triggers.
        Also I added a speed up of filtering by using a temp buffer when
        filters are set"
      
      * tag 'trace-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (45 commits)
        tracing: Use temp buffer when filtering events
        tracing: Remove TRACE_EVENT_FL_USE_CALL_FILTER logic
        tracing: Remove unused function trace_current_buffer_lock_reserve()
        tracing: Remove one use of trace_current_buffer_lock_reserve()
        tracing: Have trace_buffer_unlock_commit() call the _regs version with NULL
        tracing: Remove unused function trace_current_buffer_discard_commit()
        tracing: Move trace_buffer_unlock_commit{_regs}() to local header
        tracing: Fold filter_check_discard() into its only user
        tracing: Make filter_check_discard() local
        tracing: Move event_trigger_unlock_commit{_regs}() to local header
        tracing: Don't use the address of the buffer array name in copy_from_user
        tracing: Handle tracing_map_alloc_elts() error path correctly
        tracing: Add check for NULL event field when creating hist field
        tracing: checking for NULL instead of IS_ERR()
        tracing: Do not inherit event-fork option for instances
        tracing: Fix unsigned comparison to zero in hist trigger code
        kselftests/ftrace: Add a test for log2 modifier of hist trigger
        tracing: Add hist trigger 'log2' modifier
        kselftests/ftrace: Add hist trigger testcases
        kselftests/ftrace : Add event trigger testcases
        ...
      2600a46e
    • L
      Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit · 03e1aa1c
      Linus Torvalds 提交于
      Pull audit updates from Paul Moore:
       "Four small audit patches for 4.7.
      
        Two are simple cleanups around the audit thread management code, one
        adds a tty field to AUDIT_LOGIN events, and the final patch makes
        tty_name() usable regardless of CONFIG_TTY.
      
        Nothing controversial, and it all passes our regression test"
      
      * 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit:
        tty: provide tty_name() even without CONFIG_TTY
        audit: add tty field to LOGIN event
        audit: we don't need to __set_current_state(TASK_RUNNING)
        audit: cleanup prune_tree_thread
      03e1aa1c
    • L
      Merge tag 'rproc-v4.7' of git://github.com/andersson/remoteproc · 97f00905
      Linus Torvalds 提交于
      Pull remoteproc updates from Bjorn Andersson:
       "Introduce a synchronization point between the async firmware loading
        and clients requesting the remote processor to boot, as well as
        support for remote processors that are not interested in the resource
        table information"
      
      * tag 'rproc-v4.7' of git://github.com/andersson/remoteproc:
        remoteproc: Add additional crash reasons
        remoteproc: core: Make the loaded resource table optional
        remoteproc: core: Task sync during rproc_fw_boot()
      97f00905
    • L
      Merge tag 'rpmsg-v4.7' of git://github.com/andersson/remoteproc · 676d9735
      Linus Torvalds 提交于
      Pull rpmsg updates from Bjorn Andersson:
       "Refactor rpmsg module registration to follow other subsystems; by
        introduction of module_rpmsg_driver and hiding of THIS_MODULE from
        clients"
      
      * tag 'rpmsg-v4.7' of git://github.com/andersson/remoteproc:
        rpmsg: use module_rpmsg_driver in existing drivers and examples
        rpmsg: add helper macro module_rpmsg_driver
        rpmsg: drop owner assignment from rpmsg_drivers
        rpmsg: add THIS_MODULE to rpmsg_driver in rpmsg core
      676d9735
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 888dae53
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
       "First round of updates for the input subsystem.  No new drivers here,
        just some driver fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: rotary-encoder - fix bare use of 'unsigned'
        Input: cm109 - spin_lock in complete() cleanup
        Input: cm109 - fix handling of volume and mute buttons
        Input: byd - don't wipe dynamically allocated memory twice
        Input: twl4030 - fix unsafe macro definition
        Input: twl6040-vibra - remove mutex
        Input: bcm_iproc_tsc - DT spelling s/clock-name/clock-names/
        Input: bcm_iproc_tsc - use syscon to access shared registers
        Input: ti_am335x_tsc - use SIMPLE_DEV_PM_OPS
        Input: omap-keypad - remove set_col_gpio_val() and get_row_gpio_val()
        Input: omap-keypad - drop empty PM stubs
        Input: omap-keypad - remove adjusting of scan delay
        Input: gpio-keys - clean up device tree binding example
        Input: kbtab - stop saving struct usb_device
        Input: gtco - stop saving struct usb_device
        Input: aiptek - stop saving struct usb_device
        Input: acecad - stop saving struct usb_device
      888dae53
    • L
      Merge tag 'media/v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 19c5abcb
      Linus Torvalds 提交于
      Pull media updates from Mauro Carvalho Chehab:
       - added support for Intersil/Techwell TW686x-based video capture cards
       - v4l PCI skeleton driver moved to samples directory
       - Documentation cleanups and improvements
       - RC: reduced the memory footprint for IR raw events
       - tpg: Export the tpg code from vivid as a module
       - adv7180: Add device tree binding documentation
       - lots of driver improvements and fixes
      
      * tag 'media/v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (173 commits)
        [media] exynos-gsc: avoid build warning without CONFIG_OF
        [media] samples: v4l: from Documentation to samples directory
        [media] dib0700: add USB ID for another STK8096-PVR ref design based card
        [media] tvp5150: propagate I2C write error in .s_register callback
        [media] tvp5150: return I2C write operation failure to callers
        [media] em28xx: add support for Hauppauge WinTV-dualHD DVB tuner
        [media] em28xx: add missing USB IDs
        [media] update cx23885 and em28xx cardlists
        [media] media: au0828 fix au0828_v4l2_device_register() to not unlock and free
        [media] c8sectpfe: Rework firmware loading mechanism
        [media] c8sectpfe: Demote print to dev_dbg
        [media] c8sectpfe: Fix broken circular buffer wp management
        [media] media-device: Simplify compat32 logic
        [media] media: i2c: ths7303: remove redundant assignment on bt
        [media] dvb-usb: hide unused functions
        [media] xilinx-vipp: remove unnecessary of_node_put
        [media] drivers/media/media-devnode: clear private_data before put_device()
        [media] drivers/media/media-device: move debug log before _devnode_unregister()
        [media] drivers/media/rc: postpone kfree(rc_dev)
        [media] media/dvb-core: forward media_create_pad_links() return value
        ...
      19c5abcb
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 675e0655
      Linus Torvalds 提交于
      Pull SCSI updates from James Bottomley:
       "First round of SCSI updates for the 4.6+ merge window.
      
        This batch includes the usual quota of driver updates (bnx2fc, mp3sas,
        hpsa, ncr5380, lpfc, hisi_sas, snic, aacraid, megaraid_sas).  There's
        also a multiqueue update for scsi_debug, assorted bug fixes and a few
        other minor updates (refactor of scsi_sg_pools into generic code, alua
        and VPD updates, and struct timeval conversions)"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (138 commits)
        mpt3sas: Used "synchronize_irq()"API to synchronize timed-out IO & TMs
        mpt3sas: Set maximum transfer length per IO to 4MB for VDs
        mpt3sas: Updating mpt3sas driver version to 13.100.00.00
        mpt3sas: Fix initial Reference tag field for 4K PI drives.
        mpt3sas: Handle active cable exception event
        mpt3sas: Update MPI header to 2.00.42
        Revert "lpfc: Delete unnecessary checks before the function call mempool_destroy"
        eata_pio: missing break statement
        hpsa: Fix type ZBC conditional checks
        scsi_lib: Decode T10 vendor IDs
        scsi_dh_alua: do not fail for unknown VPD identification
        scsi_debug: use locally assigned naa
        scsi_debug: uuid for lu name
        scsi_debug: vpd and mode page work
        scsi_debug: add multiple queue support
        bfa: fix bfa_fcb_itnim_alloc() error handling
        megaraid_sas: Downgrade two success messages to info
        cxlflash: Fix to resolve dead-lock during EEH recovery
        scsi_debug: rework resp_report_luns
        scsi_debug: use pdt constants
        ...
      675e0655
    • L
      Merge branch 'stable/for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft · d974f09e
      Linus Torvalds 提交于
      Pull iscsi_ibft updates from Konrad Rzeszutek Wilk:
       "The pull has two features - both of them expand the SysFS entries:
      
         - 'prefix-len' - which is subnet_mask_prefix of the iBFT header.
      
         - 'acpi_header' dir with: 'iBFT', OEM-ID (whatever it extracts from
           the iBFT header) and OEM_TABLE_ID (also whatever it extracts from
           the iBFT header).  This is to help NIC drivers to figure out during
           bootup how to deal with BIOS created iBFT tables (like by TianoCore
           UEFI implemenation)"
      
      * 'stable/for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
        ibft: Expose iBFT acpi header via sysfs
        iscsi_ibft: Add prefix-len attr and display netmask
      d974f09e
    • L
      Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4a5219ed
      Linus Torvalds 提交于
      Pull ARM SoC driver updates from Arnd Bergmann:
       "Driver updates for ARM SoCs, these contain various things that touch
        the drivers/ directory but got merged through arm-soc for practical
        reasons.
      
        For the most part, this is now related to power management
        controllers, which have not yet been abstracted into a separate
        subsystem, and typically require some code in drivers/soc or arch/arm
        to control the power domains.
      
        Another large chunk here is a rework of the NVIDIA Tegra USB3.0
        support, which was surprisingly tricky and took a long time to get
        done.
      
        Finally, reset controller handling as always gets merged through here
        as well"
      
      * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)
        arm-ccn: Enable building as module
        soc/tegra: pmc: Add generic PM domain support
        usb: xhci: tegra: Add Tegra210 support
        usb: xhci: Add NVIDIA Tegra XUSB controller driver
        dt-bindings: usb: xhci-tegra: Add Tegra210 XUSB controller support
        dt-bindings: usb: Add NVIDIA Tegra XUSB controller binding
        PCI: tegra: Support per-lane PHYs
        dt-bindings: pci: tegra: Update for per-lane PHYs
        phy: tegra: Add Tegra210 support
        phy: Add Tegra XUSB pad controller support
        dt-bindings: phy: tegra-xusb-padctl: Add Tegra210 support
        dt-bindings: phy: Add NVIDIA Tegra XUSB pad controller binding
        phy: core: Allow children node to be overridden
        clk: tegra: Add interface to enable hardware control of SATA/XUSB PLLs
        drivers: firmware: psci: make two helper functions inline
        soc: renesas: rcar-sysc: Add support for R-Car H3 power areas
        soc: renesas: rcar-sysc: Add support for R-Car E2 power areas
        soc: renesas: rcar-sysc: Add support for R-Car M2-N power areas
        soc: renesas: rcar-sysc: Add support for R-Car M2-W power areas
        soc: renesas: rcar-sysc: Add support for R-Car H2 power areas
        ...
      4a5219ed
    • L
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 9797f6b0
      Linus Torvalds 提交于
      Pull ARM SoC defconfig updates from Arnd Bergmann:
       "As usual, a bunch of commits, mostly adding drivers and other options
        to defconfigs.
      
        We are adding three new defconfig files for the newly added 32-bit
        machines (aspeed and mps2), the rest is mainly housekeeping.
      
        The changes outside of arch/arm/config/ are for a Kconfig symbol that
        got renamed"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (63 commits)
        ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME
        ARM: u8500_defconfig: update sensor config
        ARM: u8500_defconfig: remove staging from defconfig
        ARM: multi_v7_defconfig: Remove unused Kconfig option MACH_UX500_DT
        ARM: at91/defconfig: sama5: add CONFIG_FHANDLE
        arm/configs: Add Aspeed defconfig
        arm/configs/multi_v5: Add Aspeed ast2400
        ARM: at91: sama5: Update defconfig
        ARM: imx_v6_v7_defconfig: add CONFIG_MICREL_PHY
        ARM: imx_v6_v7_defconfig: add CONFIG_I2C_GPIO
        ARM: multi_v7: Enable Tegra XUSB controller in defconfig
        ARM: tegra: Enable XUSB controller in defconfig
        ARM: omap2plus_defconfig: Enable PWM and ir-rx51 as loadable modules
        ARM: multi_v7_defconfig: add the Atmel sama5d2-compatible ADC driver
        ARM: multi_v7_defconfig: add the Atmel Audio microphone interface PDMIC
        ARM: multi_v7_defconfig: add Atmel ISI (Image Sensor Interface) driver
        ARM: multi_v7_defconfig: add Atmel watchdog timers
        ARM: multi_v7_defconfig: add HLCDC drivers as modules
        ARM: at91/defconfig: add PDMIC driver to sama5_defconfig
        ARM: at91/defconfig: add HLCDC driver to sama5_defconfig
        ...
      9797f6b0