diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-15 17:43:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-15 17:43:53 +0200 |
| commit | b48b63a1f6e26b0dec2c9f1690396ed4bcb66903 (patch) | |
| tree | 8d9ad227c3a7d35cd78d40ecaf9bf59375dbd21a /mm/migrate.c | |
| parent | drivers/isdn/gigaset/common.c: Remove useless kfree (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes (diff) | |
| download | linux-b48b63a1f6e26b0dec2c9f1690396ed4bcb66903.tar.xz linux-b48b63a1f6e26b0dec2c9f1690396ed4bcb66903.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 'mm/migrate.c')
0 files changed, 0 insertions, 0 deletions