1. 06 Jun, 2013 3 commits
    • Nobuhiro Iwamatsu's avatar
      sh_eth: use EDSR_ENALL to set EDSR · ddcd91c6
      Nobuhiro Iwamatsu authored
      Use now always available EDSR_ENALL instead of the bare number to set EDSR.
      Signed-off-by: default avatarNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
      [Sergei: added the changelog, reworded the subject, changing the prefix.]
      Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ddcd91c6
    • Nobuhiro Iwamatsu's avatar
      sh_eth: remove #ifdef around EDSR and GECMR bit definitions · 41d5ffeb
      Nobuhiro Iwamatsu authored
      Remove #ifdef around 'enum EDSR_BIT' and 'enum GECMR_BIT', replacing it with the
      comments on which SoCs these registers exist.
      
      SH7757 also has EDSR, so add a comment about it to 'enum EDSR_BIT'.
      Signed-off-by: default avatarNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
      [Sergei: folded in the former patch #2, updated the changelog, reworded the
      subject, changing the prefix.]
      Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      41d5ffeb
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 143554ac
      David S. Miller authored
      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: default avatarDavid S. Miller <davem@davemloft.net>
      143554ac
  2. 05 Jun, 2013 30 commits
  3. 04 Jun, 2013 7 commits