1. 07 6月, 2013 6 次提交
  2. 06 6月, 2013 2 次提交
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 143554ac
      David S. Miller 提交于
      Conflicts:
      	net/netfilter/nf_log.c
      
      The conflict in nf_log.c is that in 'net' we added CONFIG_PROC_FS
      protection around foo_proc_entry() calls to fix a build failure,
      whereas in Pablo's tree a guard if() test around a call is
      remove_proc_entry() was removed.  Trivially resolved.
      
      Pablo Neira Ayuso says:
      
      ====================
      The following patchset contains the first batch of
      Netfilter/IPVS updates for your net-next tree, they are:
      
      * Three patches with improvements and code refactorization
        for nfnetlink_queue, from Florian Westphal.
      
      * FTP helper now parses replies without brackets, as RFC1123
        recommends, from Jeff Mahoney.
      
      * Rise a warning to tell everyone about ULOG deprecation,
        NFLOG has been already in the kernel tree for long time
        and supersedes the old logging over netlink stub, from
        myself.
      
      * Don't panic if we fail to load netfilter core framework,
        just bail out instead, from myself.
      
      * Add cond_resched_rcu, used by IPVS to allow rescheduling
        while walking over big hashtables, from Simon Horman.
      
      * Change type of IPVS sysctl_sync_qlen_max sysctl to avoid
        possible overflow, from Zhang Yanfei.
      
      * Use strlcpy instead of strncpy to skip zeroing of already
        initialized area to write the extension names in ebtables,
        from Chen Gang.
      
      * Use already existing per-cpu notrack object from xt_CT,
        from Eric Dumazet.
      
      * Save explicit socket lookup in xt_socket now that we have
        early demux, also from Eric Dumazet.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      143554ac
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 6bc19fb8
      David S. Miller 提交于
      Merge 'net' bug fixes into 'net-next' as we have patches
      that will build on top of them.
      
      This merge commit includes a change from Emil Goode
      (emilgoode@gmail.com) that fixes a warning that would
      have been introduced by this merge.  Specifically it
      fixes the pingv6_ops method ipv6_chk_addr() to add a
      "const" to the "struct net_device *dev" argument and
      likewise update the dummy_ipv6_chk_addr() declaration.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6bc19fb8
  3. 05 6月, 2013 32 次提交