diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-15 11:43:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-15 11:43:53 -0400 |
| commit | 8aa6d9ffd45ffab4ea7d7c3f2b81def9f1cc880d (patch) | |
| tree | 5fb99b35f01b3dd4987dd4a67aed3b8ff6eda392 /crypto/cast5.c | |
| parent | 9d3901475c0f3020f65f8054ba8f74d00a06cbea (diff) | |
| parent | fb6e03d937365cba54d5d8d923158562169ebfd1 (diff) | |
| download | linux-crypto-8aa6d9ffd45ffab4ea7d7c3f2b81def9f1cc880d.tar.gz linux-crypto-8aa6d9ffd45ffab4ea7d7c3f2b81def9f1cc880d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/netfilter/nfnetlink_log.c
net/netfilter/xt_LOG.c
Rather easy conflict resolution, the 'net' tree had bug fixes to make
sure we checked if a socket is a time-wait one or not and elide the
logging code if so.
Whereas on the 'net-next' side we are calculating the UID and GID from
the creds using different interfaces due to the user namespace changes
from Eric Biederman.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/cast5.c')
0 files changed, 0 insertions, 0 deletions