b48b63a1f6
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> |
||
---|---|---|
.. | ||
android | ||
asus_oled | ||
bcm | ||
ccg | ||
comedi | ||
cptm1217 | ||
crystalhd | ||
csr | ||
cxt1e1 | ||
echo | ||
et131x | ||
frontier | ||
ft1000 | ||
gdm72xx | ||
iio | ||
ipack | ||
keucr | ||
line6 | ||
media | ||
net | ||
nvec | ||
octeon | ||
olpc_dcon | ||
omap-thermal | ||
omapdrm | ||
ozwpan | ||
panel | ||
phison | ||
quickstart | ||
ramster | ||
rtl8187se | ||
rtl8192e | ||
rtl8192u | ||
rtl8712 | ||
rts5139 | ||
rts_pstor | ||
sbe-2t3e3 | ||
sep | ||
serqt_usb2 | ||
slicoss | ||
sm7xxfb | ||
speakup | ||
ste_rmi4 | ||
telephony | ||
tidspbridge | ||
usbip | ||
vme | ||
vt6655 | ||
vt6656 | ||
winbond | ||
wlags49_h2 | ||
wlags49_h25 | ||
wlan-ng | ||
xgifb | ||
zcache | ||
zram | ||
zsmalloc | ||
Kconfig | ||
Makefile | ||
staging.c |