Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

272a5322

Commit 272a5322 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents 051d3cbd ba13c984

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/netfilter_bridge/ebt_log.h 1 addition, 0 deletions

include/linux/netfilter_bridge/ebt_log.h
include/linux/netfilter_ipv4/ipt_LOG.h 2 additions, 1 deletion

include/linux/netfilter_ipv4/ipt_LOG.h
include/linux/netfilter_ipv6/ip6t_LOG.h 2 additions, 1 deletion

include/linux/netfilter_ipv6/ip6t_LOG.h
include/net/xfrm.h 0 additions, 1 deletion

include/net/xfrm.h
net/bridge/netfilter/ebt_log.c 6 additions, 1 deletion

net/bridge/netfilter/ebt_log.c
net/core/request_sock.c 0 additions, 1 deletion

net/core/request_sock.c
net/ipv4/esp4.c 66 additions, 119 deletions

net/ipv4/esp4.c
net/ipv4/netfilter/ipt_LOG.c 6 additions, 1 deletion

net/ipv4/netfilter/ipt_LOG.c
net/ipv6/netfilter/ip6t_LOG.c 6 additions, 1 deletion

net/ipv6/netfilter/ip6t_LOG.c
net/netfilter/nf_queue.c 20 additions, 22 deletions

net/netfilter/nf_queue.c
net/xfrm/xfrm_policy.c 0 additions, 7 deletions

net/xfrm/xfrm_policy.c

with 109 additions and 155 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment