malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
msm-4.14/net
History
David S. Miller b48b63a1f6 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>
2012-09-15 11:43:53 -04:00
..
9p
net: Fix (nearly-)kernel-doc comments for various functions
2012-07-10 23:13:45 -07:00
802
…
8021q
vlan: add helper which can be called to see if device is used by vlan
2012-08-24 13:46:39 -04:00
appletalk
userns: Print out socket uids in a user namespace aware fashion.
2012-08-14 21:48:06 -07:00
atm
net🏧fix up ENOIOCTLCMD error handling
2012-08-31 16:14:33 -04:00
ax25
userns: Convert net/ax25 to use kuid_t where appropriate
2012-08-14 21:49:42 -07:00
batman-adv
batman-adv: Start new development cycle
2012-08-23 14:20:23 +02:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
bridge
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
caif
caif: move the dereference below the NULL test
2012-09-10 16:13:31 -04:00
can
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
ceph
libceph: avoid truncation due to racing banners
2012-08-21 15:55:27 -07:00
core
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
dcb
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
dccp
dccp: fix info leak via getsockopt(DCCP_SOCKOPT_CCID_TX_INFO)
2012-08-15 21:36:31 -07:00
decnet
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
dns_resolver
…
dsa
…
ethernet
ipx: move peII functions
2012-07-19 10:48:00 -07:00
ieee802154
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
ipx
userns: Print out socket uids in a user namespace aware fashion.
2012-08-14 21:48:06 -07:00
irda
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
iucv
net: remove skb_orphan_try()
2012-06-15 15:30:15 -07:00
key
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
l2tp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
lapb
…
llc
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-08-24 18:54:37 -04:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
mac802154
mac802154: sparse warnings: make symbols static
2012-07-12 07:54:45 -07:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
netlabel
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
netlink
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
netrom
netrom: copy_datagram_iovec can fail
2012-09-04 12:57:35 -04:00
nfc
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
openvswitch
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
packet
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
phonet
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
rds
rds: Don't disable BH on BH context
2012-08-22 22:52:04 -07:00
rfkill
Revert "rfkill: remove dead code"
2012-08-21 20:50:25 +02:00
rose
…
rxrpc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-07-10 23:56:33 -07:00
sched
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
sctp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
sunrpc
NFS client bugfixes for Linux 3.6
2012-09-13 09:04:13 +08:00
tipc
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
unix
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
wanrouter
wanmain: comparing array with NULL
2012-07-24 13:55:21 -07:00
wimax
…
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
x25
net: Fix (nearly-)kernel-doc comments for various functions
2012-07-10 23:13:45 -07:00
xfrm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
compat.c
net: Fix references to out-of-scope variables in put_cmsg_compat()
2012-07-22 17:50:49 -07:00
Kconfig
net: Add INET dependency on aes crypto for the sake of TCP fastopen.
2012-09-04 14:20:14 -04:00
Makefile
…
nonet.c
…
socket.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-15 11:43:53 -04:00
sysctl_net.c
…