1. 24 Nov, 2015 4 commits
    • David S. Miller's avatar
      Merge tag 'linux-can-next-for-4.5-20151123' of... · 8e017e00
      David S. Miller authored
      Merge tag 'linux-can-next-for-4.5-20151123' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
      
      Marc Kleine-Budde says:
      
      ====================
      pull-request: can-next 2015-11-23
      
      this is a pull request of a single patch for net-next/master.
      
      The patch by Kedareswara rao Appana converts the xilinx CAN driver to
      runtime_pm.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8e017e00
    • Geert Uytterhoeven's avatar
      net/ipv4/ipconfig: Rejoin broken lines in console output · 6c1c36b0
      Geert Uytterhoeven authored
      Commit 09605cc1 ("net ipv4: use preferred log methods") replaced
      a few calls of pr_cont() after a console print without a trailing
      newline by pr_info(), causing lines to be split during IP
      autoconfiguration, like:
      
          .
          ,
           OK
          IP-Config: Got DHCP answer from 192.168.97.254,
          my address is 192.168.97.44
      
      Convert these back to using pr_cont(), so it prints again:
      
          ., OK
          IP-Config: Got DHCP answer from 192.168.97.254, my address is 192.168.97.44
      
      Absorb the printing of "my address ..." into the previous call to
      pr_info(), as there's no reason to use a continuation there.
      
      Convert one more pr_info() to print nameservers while we're at it.
      
      Fixes: 09605cc1 ("net ipv4: use preferred log methods")
      Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6c1c36b0
    • Arnd Bergmann's avatar
      net: dsa: include gpio consumer header file · 85beabfe
      Arnd Bergmann authored
      After the introduction of the switch gpio reset API, I'm getting
      build errors in configurations that disable CONFIG_GPIOLIB:
      
      net/dsa/dsa.c:783:16: error: implicit declaration of function 'gpio_to_desc' [-Werror=implicit-function-declaration]
      
      The reason is that linux/gpio/consumer.h is not automatically
      included without gpiolib support. This adds an explicit #include
      statement to make it compile in all configurations. The reset
      functionality will not work without gpiolib, which is what you
      get when disabling the feature.
      
      As far as I can tell, gpiolib is supported on all architectures
      on which you can have DSA at the moment.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Fixes: cc30c163 ("net: dsa: Add support for a switch reset gpio")
      Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      85beabfe
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 57ef5527
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2015-11-23
      
      This series contains updates to ixgbe, ixgbevf, fm10k, i40e and i40evf.
      
      Jacob fixes an issue where VF could attempt to read queues it does not own,
      so prevent this we check queue 0 before we continue.
      
      Matthew fixes the MTU for jumbo frames for fm10k.
      
      Julia Lawall cleans up a unneeded NULL test in ixgbe.
      
      Mark cleans up a redundant header inclusion.  Adds KR mode support for
      CS4227 chip.  Cleaned up diagnostic code, which is no longer needed, for
      the CS4227 chip.
      
      Jean Sacren fixes kernel documentation for ixgbe.
      
      Alex Duyck fixes an fm10k and ixgbe issue in which the polling routine would
      increase the budget for receive to at least 1 per queue if multiple queues were
      present.  This would result in receive packets being processed when the budget
      was 0 which is meant to indicate that no receive can be handled.  Also fixes
      an ixgbevf performance issue where netperf test will starve for memory in the
      time form one transmit interrupt to the next, so limit lowest interrupt rate
      for adaptive interrupt moderation to 12K.  Fixed up ixgbe and ixgbevf to
      use napi_schedule_irqoff() where the drivers were run from hard interrupt
      context or with interrupts already disabled in netpoll.
      
      Jesse fixes a compiler warning about an unused variable for i40evf.
      
      John Greene fixes an issue with ixgbevf, where if the VF driver is loaded
      while the corresponding PH interface is down, the driver assigns a random
      MAC address, can be overwritten with the value of hw->mac.perm_addr which
      is 0 at that point.  So avoid this case by initializing hw->mac.perm_addr
      to the randomly generated address and do not set it unless we receive an
      ACK from ixgbe.
      
      Rasmus Villemoes cleans up some confusing code in i40e debugfs code.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      57ef5527
  2. 23 Nov, 2015 36 commits