1. 25 Mar, 2016 4 commits
  2. 24 Mar, 2016 29 commits
    • Petri Gynther's avatar
      net: bcmgenet: fix skb_len in bcmgenet_xmit_single() · 7dd39913
      Petri Gynther authored
      skb_len needs to be skb_headlen(skb) in bcmgenet_xmit_single().
      
      Fragmented skbs can have only Ethernet + IP + TCP headers (14+20+20=54 bytes)
      in the linear buffer, followed by the rest in fragments. Bumping skb_len to
      ETH_ZLEN would be incorrect for this case, as it would introduce garbage
      between TCP header and the fragment data.
      
      This also works with regular/non-fragmented small packets < ETH_ZLEN bytes.
      Successfully tested this on GENETv3 with 42-byte ARP frames.
      
      For testing, I used:
      ethtool -K eth0 tx-checksum-ipv4 off
      ethtool -K eth0 tx-checksum-ipv6 off
      echo 0 > /proc/sys/net/ipv4/tcp_timestamps
      
      Fixes: 1c1008c7 ("net: bcmgenet: add main driver file")
      Signed-off-by: default avatarPetri Gynther <pgynther@google.com>
      Acked-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7dd39913
    • Petri Gynther's avatar
      net: bcmgenet: fix dev->stats.tx_bytes accounting · 55868120
      Petri Gynther authored
      1. Add bytes_compl local variable to __bcmgenet_tx_reclaim() to collect
         transmitted bytes. dev->stats updates can then be moved outside the
         while-loop. bytes_compl is also needed for future BQL support.
      2. When bcmgenet device uses Tx checksum offload, each transmitted skb
         gets an extra 64-byte header prepended to it. Before this header is
         prepended to the skb, we need to save the skb "wire" length in
         GENET_CB(skb)->bytes_sent, so that proper Tx bytes accounting can
         be done in __bcmgenet_tx_reclaim().
      3. skb->len covers the entire length of skb, whether it is linear or
         fragmented. Thus, when we clean the fragments, do not increase
         transmitted bytes.
      
      Fixes: 1c1008c7 ("net: bcmgenet: add main driver file")
      Signed-off-by: default avatarPetri Gynther <pgynther@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      55868120
    • Nicolas Dichtel's avatar
      switchdev: fix typo in comments/doc · 3e347660
      Nicolas Dichtel authored
      Two minor typo.
      Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3e347660
    • Cyrille Pitchen's avatar
      net: macb: replace macb_writel() call by queue_writel() to update queue ISR · ba504994
      Cyrille Pitchen authored
      macb_interrupt() should not use macb_writel(bp, ISR, <value>) but only
      queue_writel(queue, ISR, <value>).
      
      There is one IRQ and one set of {ISR, IER, IDR, IMR} [1] registers per
      queue on gem hardware, though only queue0 is actually used for now to
      receive frames: other queues can already be used to transmit frames.
      
      The queue_readl() and queue_writel() helper macros are designed to access
      the relevant IRQ registers.
      
      [1]
      ISR: Interrupt Status Register
      IER: Interrupt Enable Register
      IDR: Interrupt Disable Register
      IMR: Interrupt Mask Register
      Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@atmel.com>
      Fixes: bfbb92c4 ("net: macb: Handle the RXUBR interrupt on all devices")
      Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ba504994
    • David S. Miller's avatar
      Merge branch 'hns-fixes' · 7629d9c1
      David S. Miller authored
      Yisen Zhuang says:
      
      ====================
      net: hns: fix some bugs in HNS driver
      
      Here are some bug fixed patches for HNS driver.
      
      They are:
      
      >from Kejian, fix for the warning of passing zero to 'PTR_ERR'
      
      >from qianqian, four fixes for inappropriate operation in hns driver
      
      >from Sheng, one fix for optimization of irq proccess in hns driver, and
      one fix for hilink status for hns driver.
      
      For more details, please see individual patches.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7629d9c1
    • Sheng Li's avatar
      net: hns: bug fix about getting hilink status for HNS v2 · c1203fe7
      Sheng Li authored
      The hilink status reg in HNS V2 is different from HNS v1. In HNS V2, It
      distinguishes differnt lane status according to the bit-field of the reg.
      As is shown below:
      [0:0] ---> lane0
      [1:1] ---> lane1
      ...
      
      But the current driver reads the reg to get the hilink status ONLY
      concidering HNS V1 situation. Here is a patch to support both of them.
      Signed-off-by: default avatarSheng Li <lisheng011@huawei.com>
      Signed-off-by: default avatarDaode Huang <huangdaode@hisilicon.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c1203fe7
    • Kejian Yan's avatar
      net: hns: fix warning of passing zero to 'PTR_ERR' · daa8cfd9
      Kejian Yan authored
      There is a misuse of PTR as shown below:
      
      	ae_node = (void *)of_parse_phandle(dev->of_node,
      					   "ae-handle",
      					   0);
      	if (IS_ERR_OR_NULL(ae_node)) {
      		ret = PTR_ERR(ae_node);
      		dev_err(dev, "not find ae-handle\n");
      		goto out_read_prop_fail;
      	}
      
      if the ae_node is NULL, PTR_ERR(ae_node) means it returns success. And the
      return value should be -ENODEV.
      Signed-off-by: default avatarKejian Yan <yankejian@huawei.com>
      Signed-off-by: default avatarYisen Zhuang <Yisen.Zhuang@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      daa8cfd9
    • Sheng Li's avatar
      net: hns: optimizate irq proccess for HNS V2 · 4b34aa41
      Sheng Li authored
      In hns V1, common_poll should check and clean fbd pkts, because it
      can not pend irq to clean them if there is no new pkt comes in.
      But hns V2 hw fixes this bug, and will pend irq itself to do this.
      So, for hns V2, we set ring_data->fini_process to NULL.
      Signed-off-by: default avatarSheng Li <lisheng011@huawei.com>
      Signed-off-by: default avatarYisen Zhuang <Yisen.Zhuang@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4b34aa41
    • Qianqian Xie's avatar
      net: hns: remove useless variable assignment and comment · 1c3bae6e
      Qianqian Xie authored
      The variable head in hns_nic_tx_fini_pro has read a value, but it is
      obviously no use. The patch will fix it.
      And the comment is nothing to do with the routine, so it has to be removed
      Signed-off-by: default avatarQianqian Xie <xieqianqian@huawei.com>
      Signed-off-by: default avatarYisen Zhuang <Yisen.Zhuang@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1c3bae6e
    • Qianqian Xie's avatar
      net: hns: bug fix for return values · 055a9417
      Qianqian Xie authored
      The return values in the first two functions mdiobus_write()
      are ignored. The patch will fix it.
      Signed-off-by: default avatarQianqian Xie <xieqianqian@huawei.com>
      Signed-off-by: default avatarYisen Zhuang <Yisen.Zhuang@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      055a9417
    • Qianqian Xie's avatar
      net: hns: optimizate fmt of snprintf() · 8d71397b
      Qianqian Xie authored
      It misses string format in function snprintf(), as below:
      snprintf(buff, ETH_GSTRING_LEN, g_gmac_stats_string[i].desc);
      
      It needs to add "%s" to fix it as below:
      snprintf(buff, ETH_GSTRING_LEN, "%s", g_gmac_stats_string[i].desc);
      Signed-off-by: default avatarQianqian Xie <xieqianqian@huawei.com>
      Signed-off-by: default avatarKejian Yan <yankejian@huawei.com>
      Signed-off-by: default avatarYisen Zhuang <Yisen.Zhuang@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8d71397b
    • Qianqian Xie's avatar
      net: hns: fix a bug for cycle index · 52613126
      Qianqian Xie authored
      The cycle index should be varied while the variable j is a fixed value.
      The patch will fix this bug.
      Signed-off-by: default avatarQianqian Xie <xieqianqian@huawei.com>
      Signed-off-by: default avatarYisen Zhuang <Yisen.Zhuang@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      52613126
    • subashab@codeaurora.org's avatar
      xfrm: Fix crash observed during device unregistration and decryption · 071d36bf
      subashab@codeaurora.org authored
      A crash is observed when a decrypted packet is processed in receive
      path. get_rps_cpus() tries to dereference the skb->dev fields but it
      appears that the device is freed from the poison pattern.
      
      [<ffffffc000af58ec>] get_rps_cpu+0x94/0x2f0
      [<ffffffc000af5f94>] netif_rx_internal+0x140/0x1cc
      [<ffffffc000af6094>] netif_rx+0x74/0x94
      [<ffffffc000bc0b6c>] xfrm_input+0x754/0x7d0
      [<ffffffc000bc0bf8>] xfrm_input_resume+0x10/0x1c
      [<ffffffc000ba6eb8>] esp_input_done+0x20/0x30
      [<ffffffc0000b64c8>] process_one_work+0x244/0x3fc
      [<ffffffc0000b7324>] worker_thread+0x2f8/0x418
      [<ffffffc0000bb40c>] kthread+0xe0/0xec
      
      -013|get_rps_cpu(
           |    dev = 0xFFFFFFC08B688000,
           |    skb = 0xFFFFFFC0C76AAC00 -> (
           |      dev = 0xFFFFFFC08B688000 -> (
           |        name =
      "......................................................
           |        name_hlist = (next = 0xAAAAAAAAAAAAAAAA, pprev =
      0xAAAAAAAAAAA
      
      Following are the sequence of events observed -
      
      - Encrypted packet in receive path from netdevice is queued
      - Encrypted packet queued for decryption (asynchronous)
      - Netdevice brought down and freed
      - Packet is decrypted and returned through callback in esp_input_done
      - Packet is queued again for process in network stack using netif_rx
      
      Since the device appears to have been freed, the dereference of
      skb->dev in get_rps_cpus() leads to an unhandled page fault
      exception.
      
      Fix this by holding on to device reference when queueing packets
      asynchronously and releasing the reference on call back return.
      
      v2: Make the change generic to xfrm as mentioned by Steffen and
      update the title to xfrm
      Suggested-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: default avatarJerome Stanislaus <jeromes@codeaurora.org>
      Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      071d36bf
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · e46b4e2b
      Linus Torvalds authored
      Pull tracing updates from Steven Rostedt:
       "Nothing major this round.  Mostly small clean ups and fixes.
      
        Some visible changes:
      
         - A new flag was added to distinguish traces done in NMI context.
      
         - Preempt tracer now shows functions where preemption is disabled but
           interrupts are still enabled.
      
        Other notes:
      
         - Updates were done to function tracing to allow better performance
           with perf.
      
         - Infrastructure code has been added to allow for a new histogram
           feature for recording live trace event histograms that can be
           configured by simple user commands.  The feature itself was just
           finished, but needs a round in linux-next before being pulled.
      
           This only includes some infrastructure changes that will be needed"
      
      * tag 'trace-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (22 commits)
        tracing: Record and show NMI state
        tracing: Fix trace_printk() to print when not using bprintk()
        tracing: Remove redundant reset per-CPU buff in irqsoff tracer
        x86: ftrace: Fix the misleading comment for arch/x86/kernel/ftrace.c
        tracing: Fix crash from reading trace_pipe with sendfile
        tracing: Have preempt(irqs)off trace preempt disabled functions
        tracing: Fix return while holding a lock in register_tracer()
        ftrace: Use kasprintf() in ftrace_profile_tracefs()
        ftrace: Update dynamic ftrace calls only if necessary
        ftrace: Make ftrace_hash_rec_enable return update bool
        tracing: Fix typoes in code comment and printk in trace_nop.c
        tracing, writeback: Replace cgroup path to cgroup ino
        tracing: Use flags instead of bool in trigger structure
        tracing: Add an unreg_all() callback to trigger commands
        tracing: Add needs_rec flag to event triggers
        tracing: Add a per-event-trigger 'paused' field
        tracing: Add get_syscall_name()
        tracing: Add event record param to trigger_ops.func()
        tracing: Make event trigger functions available
        tracing: Make ftrace_event_field checking functions available
        ...
      e46b4e2b
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · faea72dd
      Linus Torvalds authored
      Pull thermal updates from Zhang Rui:
      
       - Fix a regression where bogus trip points on some Lenovo laptops start
         to screw up thermal control after commit 81ad4276 ("Thermal:
         initialize thermal zone device correctly").
      
         On these Lenovo laptops, a bogus passive trip point is reported,
         which is 0 degree Celsius.  Without commit 81ad4276, thermal zone
         fails to set cooling devices to proper cooling state, which is a bug.
         But with commit 81ad4276 applied, the processors are always
         throttled on these Lenovo laptops because the current temperature is
         always higher than the passive trip point.
      
         Fix things to ignore such bogus trip points.  (Zhang Rui)
      
       - Introduce Mediatek thermal driver.  (Sascha Hauer)
      
       - Introduce devm_ versions of OF thermal sensor register API.  (Laxman
         Dewangan)
      
       - Changes in Kconfigs to allow compile test on UM arch.  (Krzysztof
         Kozlowski)
      
       - Introduce Skylake support in intel_pch_thermal driver.  (Srinivas
         Pandruvada)
      
       - Several small fixes on Rockchip, TI-SoC, Tegra, RCar, and Exynos
         thermal drivers.
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (26 commits)
        Thermal: Ignore invalid trip points
        thermal: trace: migrating thermal traces to use TRACE_DEFINE_ENUM() macros
        thermal: intel_pch_thermal: Enable Skylake PCH thermal
        thermal: doc: Add details of devm_thermal_zone_of_sensor_{register,unregister}
        thermal: of-thermal: Add devm version of thermal_zone_of_sensor_register
        thermal: doc: Add details of thermal_zone_of_sensor_{register,unregister}
        thermal: exynos: Defer probe if vtmu is present but not registered
        thermal: exynos: Use devm_regulator_get_optional() for vtmu
        thermal: exynos: List vtmu-supply as optional property in DT binding
        thermal: exynos: Print a message about exceeded number of supported trip-points
        thermal: exynos: Document number of supported trip-points
        thermal: exynos: Document compatible for Exynos5433 TMU
        thermal: mtk: allow compile testing on UM
        thermal: tegra_soctherm: fix sign bit of temperature
        thermal: Fix build error of missing devm_ioremap_resource on UM
        thermal: ti-soc-thermal: clean up the error handling a bit
        thermal: rcar: Use ARCH_RENESAS
        thermal: rcar_thermal: don't open code of_device_get_match_data()
        thermal: db8500_cpufreq_cooling: Compile with COMPILE_TEST
        thermal: rockchip: fix the tsadc sequence output on rk3228/rk3399
        ...
      faea72dd
    • Linus Torvalds's avatar
      Merge tag 'nfsd-4.6' of git://linux-nfs.org/~bfields/linux · 5b1e167d
      Linus Torvalds authored
      Pull nfsd updates from Bruce Fields:
       "Various bugfixes, a RDMA update from Chuck Lever, and support for a
        new pnfs layout type from Christoph Hellwig.  The new layout type is a
        variant of the block layout which uses SCSI features to offer improved
        fencing and device identification.
      
        (Also: note this pull request also includes the client side of SCSI
        layout, with Trond's permission.)"
      
      * tag 'nfsd-4.6' of git://linux-nfs.org/~bfields/linux:
        sunrpc/cache: drop reference when sunrpc_cache_pipe_upcall() detects a race
        nfsd: recover: fix memory leak
        nfsd: fix deadlock secinfo+readdir compound
        nfsd4: resfh unused in nfsd4_secinfo
        svcrdma: Use new CQ API for RPC-over-RDMA server send CQs
        svcrdma: Use new CQ API for RPC-over-RDMA server receive CQs
        svcrdma: Remove close_out exit path
        svcrdma: Hook up the logic to return ERR_CHUNK
        svcrdma: Use correct XID in error replies
        svcrdma: Make RDMA_ERROR messages work
        rpcrdma: Add RPCRDMA_HDRLEN_ERR
        svcrdma: svc_rdma_post_recv() should close connection on error
        svcrdma: Close connection when a send error occurs
        nfsd: Lower NFSv4.1 callback message size limit
        svcrdma: Do not send Write chunk XDR pad with inline content
        svcrdma: Do not write xdr_buf::tail in a Write chunk
        svcrdma: Find client-provided write and reply chunks once per reply
        nfsd: Update NFS server comments related to RDMA support
        nfsd: Fix a memory leak when meeting unsupported state_protect_how4
        nfsd4: fix bad bounds checking
      5b1e167d
    • Linus Torvalds's avatar
      Merge tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 8b97be05
      Linus Torvalds authored
      Pull staging driver fixes from Greg KH:
       "Here are some fixes that poped up due to the big staging tree merge,
        as well as the removal of a staging driver that now is covered by a
        "real" driver.
      
        All of these have been in linux-next for a few days with no reported
        issues"
      
      * tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: delete STE RMI4 hackish driver
        staging: android: ion_test: fix check of platform_device_register_simple() error code
        staging: wilc1000: fix a couple of memory leaks
        staging: fsl-mc: fix incorrect type passed to dev_err macros
        staging: fsl-mc: fix incorrect type passed to dev_dbg macros
        staging: wilc1000: fixed kernel panic when firmware is not started
        staging: comedi: ni_mio_common: fix the ni_write[blw]() functions
        staging: most: hdm-dim2: Remove possible dereference error
        staging: lustre: checking for NULL instead of IS_ERR
        staging: lustre: really make lustre dependent on LNet
        staging: refresh TODO for rtl8712
        staging: refresh TODO for rtl8723au
      8b97be05
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 44d1b6dd
      Linus Torvalds authored
      Pull timer fix from Thomas Gleixner:
       "A single fix to the pistachio clocksource driver using the proper
        signedness in the error print format"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        clocksource/drivers/pistachio: Correct output format of PTR_ERR()
      44d1b6dd
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0f0fbec9
      Linus Torvalds authored
      Pull irq fixes from Thomas Gleixner:
       "A small set of fixes for the usual ARM/SOC irqchip drivers
      
         - A set of fixes for mbigen to handle multiple devices in a hardware
           module proper
      
         - A cleanup for the mbigen config option which was pointlessly user
           configurable.
      
         - A cleanup for tegra replacing open coded functionality by the
           proper core function
      
        The config cleanup touches arch/arm64/Kconfig.platforms to select the
        irq chip for the related platform"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip/mbigen: Make CONFIG_HISILICON_IRQ_MBIGEN a hidden option
        ARM64: Kconfig: Select mbigen interrupt controller on Hisilicon platform
        irqchip/mbigen: Handle multiple device nodes in a mbigen module
        irqchip/mbigen: Adjust DT bindings to handle multiple devices in a module
        irqchip/tegra: Switch to use irq_domain_free_irqs_common
      0f0fbec9
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3fa2fe2c
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "This tree contains various perf fixes on the kernel side, plus three
        hw/event-enablement late additions:
      
         - Intel Memory Bandwidth Monitoring events and handling
         - the AMD Accumulated Power Mechanism reporting facility
         - more IOMMU events
      
        ... and a final round of perf tooling updates/fixes"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (44 commits)
        perf llvm: Use strerror_r instead of the thread unsafe strerror one
        perf llvm: Use realpath to canonicalize paths
        perf tools: Unexport some methods unused outside strbuf.c
        perf probe: No need to use formatting strbuf method
        perf help: Use asprintf instead of adhoc equivalents
        perf tools: Remove unused perf_pathdup, xstrdup functions
        perf tools: Do not include stringify.h from the kernel sources
        tools include: Copy linux/stringify.h from the kernel
        tools lib traceevent: Remove redundant CPU output
        perf tools: Remove needless 'extern' from function prototypes
        perf tools: Simplify die() mechanism
        perf tools: Remove unused DIE_IF macro
        perf script: Remove lots of unused arguments
        perf thread: Rename perf_event__preprocess_sample_addr to thread__resolve
        perf machine: Rename perf_event__preprocess_sample to machine__resolve
        perf tools: Add cpumode to struct perf_sample
        perf tests: Forward the perf_sample in the dwarf unwind test
        perf tools: Remove misplaced __maybe_unused
        perf list: Fix documentation of :ppp
        perf bench numa: Fix assertion for nodes bitfield
        ...
      3fa2fe2c
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d88f48e1
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "Misc fixes:
      
         - fix hotplug bugs
         - fix irq live lock
         - fix various topology handling bugs
         - fix APIC ACK ordering
         - fix PV iopl handling
         - fix speling
         - fix/tweak memcpy_mcsafe() return value
         - fix fbcon bug
         - remove stray prototypes"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/msr: Remove unused native_read_tscp()
        x86/apic: Remove declaration of unused hw_nmi_is_cpu_stuck
        x86/oprofile/nmi: Add missing hotplug FROZEN handling
        x86/hpet: Use proper mask to modify hotplug action
        x86/apic/uv: Fix the hotplug notifier
        x86/apb/timer: Use proper mask to modify hotplug action
        x86/topology: Use total_cpus not nr_cpu_ids for logical packages
        x86/topology: Fix Intel HT disable
        x86/topology: Fix logical package mapping
        x86/irq: Cure live lock in fixup_irqs()
        x86/tsc: Prevent NULL pointer deref in calibrate_delay_is_known()
        x86/apic: Fix suspicious RCU usage in smp_trace_call_function_interrupt()
        x86/iopl: Fix iopl capability check on Xen PV
        x86/iopl/64: Properly context-switch IOPL on Xen PV
        selftests/x86: Add an iopl test
        x86/mm, x86/mce: Fix return type/value for memcpy_mcsafe()
        x86/video: Don't assume all FB devices are PCI devices
        arch/x86/irq: Purge useless handler declarations from hw_irq.h
        x86: Fix misspellings in comments
      d88f48e1
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · be53f58f
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "Misc fixes: a cgroup fix, a fair-scheduler migration accounting fix, a
        cputime fix and two cpuacct cleanups"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/cpuacct: Simplify the cpuacct code
        sched/cpuacct: Rename parameter in cpuusage_write() for readability
        sched/fair: Add comments to explain select_idle_sibling()
        sched/fair: Fix fairness issue on migration
        sched/cgroup: Fix/cleanup cgroup teardown/init
        sched/cputime: Fix steal time accounting vs. CPU hotplug
      be53f58f
    • Linus Torvalds's avatar
      Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 19d6f04c
      Linus Torvalds authored
      Pull locking fixes from Ingo Molnar:
       "Documentation updates and a bitops ordering fix"
      
      * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        bitops: Do not default to __clear_bit() for __clear_bit_unlock()
        documentation: Clarify compiler store-fusion example
        documentation: Transitivity is not cumulativity
        documentation:  Add alternative release-acquire outcome
        documentation: Distinguish between local and global transitivity
        documentation: Subsequent writes ordered by rcu_dereference()
        documentation: Remove obsolete reference to RCU-protected indexes
        documentation: Fix memory-barriers.txt section references
        documentation: Fix control dependency and identical stores
      19d6f04c
    • Ingo Molnar's avatar
      Merge tag 'perf-core-for-mingo-20160323' of... · 05f5ece7
      Ingo Molnar authored
      Merge tag 'perf-core-for-mingo-20160323' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
      
      Pull perf/core improvements and fixes:
      
      User visible fixes:
      
       - Fix documentation of :ppp modifier in 'perf list' (Andi Kleen)
      
       - Fix silly nodes bitfield bits/bytes length assertion in 'perf bench numa' (Jakub Jelen)
      
       - Remove redundant CPU output in libtraceevent (Steven Rostedt)
      
       - Remove 'core_id' check in topology 'perf test' (Sukadev Bhattiprolu)
      
      Infrastructure changes/fixes:
      
       - Record text offset in dso to calculate objdump address, to use with
         modules in addition to vDSO symbol address calculations (Wang Nan)
      
       - Move utilities.mak from perf to tools/scripts/ (Arnaldo Carvalho de Melo)
      
       - Add cpumode to the perf_sample struct, this way we don't need to pass
         the union event to the machine and thread resolving routines, shortening
         function signatures and allowing the future introduction of a way
         to use tracepoint events instead of the unavailable HW cycles counter on
         powerpc guests in perf kvm by just hooking on perf_evsel__parse_sample,
         at the end (Arnaldo Carvalho de Melo)
      
       - Remove/unexport die() related infrastructure, that at some point will
         finally be removed (Arnaldo Carvalho de Melo)
      
       - Adopt linux/stringify.h from the kernel sources, not to touch this
         kernel header from tools/ (Arnaldo Carvalho de Melo)
      
       - Stop using strbuf for things we can instead trivially use libc's asprintf()
         (Arnaldo Carvalho de Melo)
      
       - Ditch tools/lib/util/abspath.c, its only exported function was used at just
         one place and can be replaced by libc's realpath() (Arnaldo Carvalho de Melo)
      
       - Use strerror_r() in the llvm infrastructure, tread safe, its what is used
         elsewhere in tools/perf/ (Arnaldo Carvalho de Melo)
      
      Cleanups:
      
       - Removed misplaced or needless __maybe_unused/export (Arnaldo Carvalho de Melo)
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      05f5ece7
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · aca04ce5
      Linus Torvalds authored
      Pull networking bugfixes from David Miller:
       "Several bug fixes rolling in, some for changes introduced in this
        merge window, and some for problems that have existed for some time:
      
        1) Fix prepare_to_wait() handling in AF_VSOCK, from Claudio Imbrenda.
      
        2) The new DST_CACHE should be a silent config option, from Dave
           Jones.
      
        3) inet_current_timestamp() unintentionally truncates timestamps to
           16-bit, from Deepa Dinamani.
      
        4) Missing reference to netns in ppp, from Guillaume Nault.
      
        5) Free memory reference in hv_netvsc driver, from Haiyang Zhang.
      
        6) Missing kernel doc documentation for function arguments in various
           spots around the networking, from Luis de Bethencourt.
      
        7) UDP stopped receiving broadcast packets properly, due to
           overzealous multicast checks, fix from Paolo Abeni"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (59 commits)
        net: ping: make ping_v6_sendmsg static
        hv_netvsc: Fix the order of num_sc_offered decrement
        net: Fix typos and whitespace.
        hv_netvsc: Fix the array sizes to be max supported channels
        hv_netvsc: Fix accessing freed memory in netvsc_change_mtu()
        ppp: take reference on channels netns
        net: Reset encap_level to avoid resetting features on inner IP headers
        net: mediatek: fix checking for NULL instead of IS_ERR() in .probe
        net: phy: at803x: Request 'reset' GPIO only for AT8030 PHY
        at803x: fix reset handling
        AF_VSOCK: Shrink the area influenced by prepare_to_wait
        Revert "vsock: Fix blocking ops call in prepare_to_wait"
        macb: fix PHY reset
        ipv4: initialize flowi4_flags before calling fib_lookup()
        fsl/fman: Workaround for Errata A-007273
        ipv4: fix broadcast packets reception
        net: hns: bug fix about the overflow of mss
        net: hns: adds limitation for debug port mtu
        net: hns: fix the bug about mtu setting
        net: hns: fixes a bug of RSS
        ...
      aca04ce5
    • Haishuang Yan's avatar
      net: ping: make ping_v6_sendmsg static · 6579a023
      Haishuang Yan authored
      As ping_v6_sendmsg is used only in this file,
      making it static
      
      The body of "pingv6_prot" and "pingv6_protosw" were
      moved at the middle of the file, to avoid having to
      declare some static prototypes.
      Signed-off-by: default avatarHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6579a023
    • Haiyang Zhang's avatar
      hv_netvsc: Fix the order of num_sc_offered decrement · 3f735131
      Haiyang Zhang authored
      Reorder the code in netvsc_sc_open(), so num_sc_offered is only decremented
      after vmbus_open() is called. This avoid pontential race of removing device
      before all channels are setup.
      Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
      Reviewed-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3f735131
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.6-1' of... · 5a010c73
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v4.6-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform driver updates from Darren Hart:
       "Significant refactoring of Dell laptop drivers, modularizing the
        smbios code.  Multiple new platforms added for ideapad, asus, dell,
        and alienware using existing quirks.  A few fixes and cleanups.
      
        hp-wmi:
         - Remove GPS rfkill support via pre-2009 interface
         - fix unregister order in hp_wmi_rfkill_setup() once again
      
        ideapad-laptop:
         - Add ideapad Y700 (15) to the no_hw_rfkill DMI list
      
        fujitsu-laptop:
         - Support radio toggle button
      
        intel-hid:
         - allocate correct amount of memory for private struct
      
        platform/x86:
         - Make intel_scu_ipc explicitly non-modular
      
        intel_pmc_ipc:
         - Avoid pending IPC1 command during legacy suspend
         - Fix GCR register base address and length
      
        asus-nb-wmi:
         - add wapf=4 quirk for ASUS X75VD
      
        intel_telemetry_pltdrv:
         - Change verbosity control bits
      
        dell-rbtn:
         - Add a comment about the XPS 13 9350
      
        dell-wmi, dell-laptop:
         - depends DMI
      
        dell-wmi:
         - support Dell Inspiron M5110
         - properly process Dell Instant Launch hotkey
         - enable receiving WMI events on Dell Vostro V131
         - Support new hotkeys on the XPS 13 9350 (Skylake)
         - Clean up hotkey table size check
         - Stop storing pointers to DMI tables
      
        dell-laptop:
         - move dell_smi_error() to dell-smbios
         - use dell_smbios_find_token() instead of find_token_location()
         - use dell_smbios_find_token() instead of find_token_id()
         - extract SMBIOS-related code to a separate module
      
        dell-smbios:
         - rename dell_smi_error() to dell_smbios_error()
         - make da_tokens static
         - remove find_token_{id,location}()
         - implement new function for finding DMI table 0xDA tokens
         - make the SMBIOS buffer static
         - return the SMBIOS buffer from dell_smbios_get_buffer()
         - don't return an SMBIOS buffer from dell_smbios_send_request()
         - don't pass an SMBIOS buffer to dell_smbios_send_request()
         - rename dell_send_request() to dell_smbios_send_request()
         - rename release_buffer() to dell_smbios_release_buffer()
         - rename clear_buffer() to dell_smbios_clear_buffer()
         - rename get_buffer() to dell_smbios_get_buffer()
      
        dell-led:
         - use dell_smbios_send_request() for performing SMBIOS calls
         - use dell_smbios_find_token() for finding mic DMI tokens
      
        toshiba_acpi:
         - Add a module parameter to disable hotkeys registration
         - Add sysfs entries for the Cooling Method feature
         - Add support for cooling method feature
      
        Documentation/ABI:
         - Update sysfs-driver-toshiba_acpi file
      
        thinkpad_acpi:
         - Remove ambiguous logging for "Unsupported brightness interface"
      
        alienware-wmi:
         - whitespace improvements
         - Add support for two new systems: ASM200 and ASM201.
         - Add support for deep sleep control.
         - Add initial support for alienware graphics amplifier.
         - Add support for new platform: X51-R3
         - Clean up whitespace for ASM100 platform"
      
      * tag 'platform-drivers-x86-v4.6-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (47 commits)
        hp-wmi: Remove GPS rfkill support via pre-2009 interface
        hp-wmi: fix unregister order in hp_wmi_rfkill_setup() once again
        dell-wmi: support Dell Inspiron M5110
        dell-wmi: properly process Dell Instant Launch hotkey
        dell-wmi: enable receiving WMI events on Dell Vostro V131
        dell-smbios: rename dell_smi_error() to dell_smbios_error()
        dell-laptop: move dell_smi_error() to dell-smbios
        ideapad-laptop: Add ideapad Y700 (15) to the no_hw_rfkill DMI list
        fujitsu-laptop: Support radio toggle button
        intel-hid: allocate correct amount of memory for private struct
        platform/x86: Make intel_scu_ipc explicitly non-modular
        intel_pmc_ipc: Avoid pending IPC1 command during legacy suspend
        intel_pmc_ipc: Fix GCR register base address and length
        asus-nb-wmi: add wapf=4 quirk for ASUS X75VD
        intel_telemetry_pltdrv: Change verbosity control bits
        dell-rbtn: Add a comment about the XPS 13 9350
        dell-wmi: Support new hotkeys on the XPS 13 9350 (Skylake)
        dell-wmi: Clean up hotkey table size check
        dell-wmi, dell-laptop: depends DMI
        dell-wmi: Stop storing pointers to DMI tables
        ...
      5a010c73
    • Linus Torvalds's avatar
      Merge tag 'pwm/for-4.6-rc1' of... · b615d3d4
      Linus Torvalds authored
      Merge tag 'pwm/for-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "No new drivers this time around, but a handful of cleanups and fixes"
      
      * tag 'pwm/for-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
        pwm: omap-dmtimer: Add debug message for effective period and duty cycle
        pwm: omap-dmtimer: Round load and match values rather than truncate
        pwm: omap-dmtimer: Add sanity checking for load and match values
        pwm: omap-dmtimer: Fix inaccurate period and duty cycle calculations
        pwm: brcmstb: Fix check of devm_ioremap_resource() return code
        pwm: rcar: Depend on ARCH_RENESAS instead of ARCH_SHMOBILE
        pwm: lpc18xx-sct: Test clock rate to avoid division by 0
        pwm: img: Test clock rate to avoid division by 0
      b615d3d4
  3. 23 Mar, 2016 7 commits