1. 07 Jan, 2016 5 commits
  2. 06 Jan, 2016 30 commits
  3. 05 Jan, 2016 5 commits
    • Hannes Frederic Sowa's avatar
      bridge: Only call /sbin/bridge-stp for the initial network namespace · ff621985
      Hannes Frederic Sowa authored
      [I stole this patch from Eric Biederman. He wrote:]
      
      > There is no defined mechanism to pass network namespace information
      > into /sbin/bridge-stp therefore don't even try to invoke it except
      > for bridge devices in the initial network namespace.
      >
      > It is possible for unprivileged users to cause /sbin/bridge-stp to be
      > invoked for any network device name which if /sbin/bridge-stp does not
      > guard against unreasonable arguments or being invoked twice on the
      > same network device could cause problems.
      
      [Hannes: changed patch using netns_eq]
      
      Cc: Eric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ff621985
    • xypron.glpk@gmx.de's avatar
      include/uapi/linux/sockios.h: mark SIOCRTMSG unused · 2fbf5758
      xypron.glpk@gmx.de authored
      IOCTL SIOCRTMSG does nothing but return EINVAL.
      
      So comment it as unused.
      
      SIOCRTMSG is only used in:
      * net/ipv4/af_inet.c
      * include/uapi/linux/sockios.h
      
      inet_ioctl calls ip_rt_ioctl.
      ip_rt_ioctl only handles SIOCADDRT and SIOCDELRT and returns -EINVAL
      otherwise.
      Signed-off-by: default avatarHeinrich Schuchardt <xypron.glpk@gmx.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2fbf5758
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.4-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · ee9a7d2c
      Linus Torvalds authored
      Pull tracing fixes from Steven Rostedt:
       "Two more fixes:
      
        1. The recordmcount change had an output that used sprintf()
           (incorrectly) when it should have been a fprintf() to stderr.
      
        2. The printk_formats file could crash if someone added a
           trace_printk() in the core kernel, and also added one in a module.
           This does not affect production kernels.  Only kernels where
           developers add trace_printk() for debugging can crash"
      
      * tag 'trace-v4.4-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Fix setting of start_index in find_next()
        ftrace/scripts: Fix incorrect use of sprintf in recordmcount
      ee9a7d2c
    • Linus Torvalds's avatar
      Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 3331f99a
      Linus Torvalds authored
      Pull tile bugfix from Chris Metcalf:
       "This fixes a bug that Sudip's buildbot found for tilepro allmodconfig.
      
        I've tagged it for stable only back to 3.19, which was when most of
        the other affected architectures added their support for working
        around this issue"
      
      * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        tile: provide CONFIG_PAGE_SIZE_64KB etc for tilepro
      3331f99a
    • David S. Miller's avatar
      Merge branch 'mlx5e-tstamp' · 1633bf11
      David S. Miller authored
      Saeed Mahameed says:
      
      ====================
      Introduce mlx5 ethernet timestamping
      
      This patch series introduces the support for ConnectX-4 timestamping
      and the PTP kernel interface.
      
      Changes from V2:
      net/mlx5_core: Introduce access function to read internal_timer
      	- Remove one line function
      	- Change function name
      
      net/mlx5e: Add HW timestamping (TS) support:
      	- Data path performance optimization (caching tstamp struct in rq,sq)
      	- Change read/write_lock_irqsave to read/write_lock
      	- Move ioctl functions to en_clock file
      	- Changed overflow start algorithm according to comments from Richard
      	- Move timestamp init/cleanup to open/close ndos.
      
      In details:
      
      1st patch prevents the driver from modifying skb->data and SKB CB in
      device xmit function.
      
      2nd patch adds the needed low level helpers for:
      	- Fetching the hardware clock (hardware internal timer)
      	- Parsing CQEs timestamps
      	- Device frequency capability
      
      3rd patch adds new en_clock.c file that handles all needed timestamping
      operations:
      	- Internal clock structure initialization and other helper functions
      	- Added the needed ioctl for setting/getting the current timestamping
      	  configuration.
      	- used this configuration in RX/TX data path to fill the SKB with
      	  the timestamp.
      
      4th patch Introduces PTP (PHC) support.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1633bf11