1. 23 Aug, 2015 10 commits
  2. 21 Aug, 2015 5 commits
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · dc25b258
      David S. Miller authored
      Conflicts:
      	drivers/net/usb/qmi_wwan.c
      
      Overlapping additions of new device IDs to qmi_wwan.c
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      dc25b258
    • David S. Miller's avatar
      enic: Fix build failure with SRIOV disabled. · 1a69205c
      David S. Miller authored
      err_out_vnic_unregister is used regardless of whether
      SRIOV is enabled or not.
      Reported-by: default avatarJesse Brandeburg <jesse.brangeburg@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1a69205c
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · a9e01ed9
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter updates for net-next
      
      This is second pull request includes the conflict resolution patch that
      resulted from the updates that we got for the conntrack template through
      kmalloc. No changes with regards to the previously sent 15 patches.
      
      The following patchset contains Netfilter updates for your net-next tree, they
      are:
      
      1) Rework the existing nf_tables counter expression to make it per-cpu.
      
      2) Prepare and factor out common packet duplication code from the TEE target so
         it can be reused from the new dup expression.
      
      3) Add the new dup expression for the nf_tables IPv4 and IPv6 families.
      
      4) Convert the nf_tables limit expression to use a token-based approach with
         64-bits precision.
      
      5) Enhance the nf_tables limit expression to support limiting at packet byte.
         This comes after several preparation patches.
      
      6) Add a burst parameter to indicate the amount of packets or bytes that can
         exceed the limiting.
      
      7) Add netns support to nfacct, from Andreas Schultz.
      
      8) Pass the nf_conn_zone structure instead of the zone ID in nf_tables to allow
         accessing more zone specific information, from Daniel Borkmann.
      
      9) Allow to define zone per-direction to support netns containers with
         overlapping network addressing, also from Daniel.
      
      10) Extend the CT target to allow setting the zone based on the skb->mark as a
         way to support simple mappings from iptables, also from Daniel.
      
      11) Make the nf_tables payload expression aware of the fact that VLAN offload
          may have removed a vlan header, from Florian Westphal.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a9e01ed9
    • Pablo Neira Ayuso's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 81bf1c64
      Pablo Neira Ayuso authored
      Resolve conflicts with conntrack template fixes.
      
      Conflicts:
      	net/netfilter/nf_conntrack_core.c
      	net/netfilter/nf_synproxy_core.c
      	net/netfilter/xt_CT.c
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      81bf1c64
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-4.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 0bad9098
      Linus Torvalds authored
      Pull power management and ACPI fixes from Rafael Wysocki:
       "These fix a recent regression in the ACPI backlight code and a memory
        leak in the Exynos cpufreq driver.
      
        Specifics:
      
         - Fix a recently introduced issue in the ACPI backlight code which
           causes lockdep to complain about a circular lock dependency during
           initialization (Hans de Goede).
      
         - Fix a possible memory during initialization in the Exynos cpufreq
           driver (Shailendra Verma)"
      
      * tag 'pm+acpi-4.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: exynos: Fix for memory leak in case SoC name does not match
        ACPI / video: Fix circular lock dependency issue in the video-detect code
      0bad9098
  3. 20 Aug, 2015 25 commits