Greg Kroah-Hartman 9f9cba810f Merge 3.8-rc5 into tty-next ...

This resolves a number of tty driver merge issues found in linux-next

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2013-01-25 13:27:36 -08:00

..

9p

virtio: 9p: correctly pass physical address to userspace for high pages

2012-10-22 18:19:36 +10:30

802

tokenring: delete all remaining driver support

2012-05-15 20:23:16 -04:00

8021q

8021q: fix vlan device to inherit the unicast filtering capability flag

2012-11-30 12:07:27 -05:00

appletalk

userns: Print out socket uids in a user namespace aware fashion.

2012-08-14 21:48:06 -07:00

atm

atm: use scnprintf() instead of sprintf()

2012-12-17 20:50:51 -08:00

ax25

userns: Convert net/ax25 to use kuid_t where appropriate

2012-08-14 21:49:42 -07:00

batman-adv

batman-adv: fix random jitter calculation

2012-12-26 14:13:23 -08:00

bluetooth

tty: Added a CONFIG_TTY option to allow removal of TTY

2013-01-18 16:15:27 -08:00

bridge

bridge: add empty br_mdb_init() and br_mdb_uninit() definitions.

2013-01-03 03:35:22 -08:00

caif

caif_usb: Make the driver name check more efficient

2012-12-09 00:34:02 -05:00

can

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

ceph

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

2013-01-02 17:32:49 -08:00

core

net, wireless: overwrite default_ethtool_ops

2013-01-11 15:55:48 -08:00

dcb

net: Allow DCBnl to use other namespaces besides init_net

2012-12-10 14:09:01 -05:00

dccp

inet: Fix kmemleak in tcp_v4/6_syn_recv_sock and dccp_v4/6_request_recv_sock

2012-12-14 13:14:07 -05:00

decnet

net: Push capable(CAP_NET_ADMIN) into the rtnl methods

2012-11-18 20:32:44 -05:00

dns_resolver

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2012-12-16 15:40:50 -08:00

dsa

dsa: Hide core config options; make drivers select what they need

2012-11-26 17:10:44 -05:00

ethernet

ipx: move peII functions

2012-07-19 10:48:00 -07:00

ieee802154

6lowpan: consider checksum bytes in fragmentation threshold

2012-11-30 12:19:24 -05:00

ipv4

tcp: accept RST without ACK flag

2013-01-10 22:49:30 -08:00

ipv6

ipv6: use addrconf_get_prefix_route for prefix route lookup [v2]

2013-01-10 14:22:54 -08:00

ipx

userns: Print out socket uids in a user namespace aware fashion.

2012-08-14 21:48:06 -07:00

irda

tty: Added a CONFIG_TTY option to allow removal of TTY

2013-01-18 16:15:27 -08:00

iucv

s390/irq: remove split irq fields from /proc/stat

2013-01-08 10:57:07 +01:00

key

net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm

2012-11-18 20:32:45 -05:00

l2tp

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

2012-11-10 18:32:51 -05:00

lapb

lapb: Neaten debugging

2012-05-17 18:45:20 -04:00

llc

net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm

2012-11-18 20:32:45 -05:00

mac80211

mac80211: fix maximum MTU

2013-01-03 13:00:01 +01:00

mac802154

mac802154: fix NOHZ local_softirq_pending 08 warning

2013-01-04 13:47:21 -08:00

netfilter

netfilter: xt_recent: avoid high order page allocations

2013-01-04 20:14:42 +01:00

netlabel

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

2012-10-02 13:38:27 -07:00

netlink

netlink: validate addr_len on bind

2012-12-17 20:50:51 -08:00

netrom

net: change return values from -EACCES to -EPERM

2012-09-21 13:58:08 -04:00

nfc

nfc: remove noisy message from llcp_sock_sendmsg

2012-12-13 12:58:10 -05:00

openvswitch

openvswitch: Use RCU callback when detaching netdevices.

2012-11-28 14:04:34 -08:00

packet

net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm

2012-11-18 20:32:45 -05:00

phonet

net: Push capable(CAP_NET_ADMIN) into the rtnl methods

2012-11-18 20:32:44 -05:00

rds

IB/rds: suppress incompatible protocol when version is known

2012-12-26 15:17:37 -08:00

rfkill

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

rose

net: Convert all sysctl registrations to register_net_sysctl

2012-04-20 21:22:30 -04:00

rxrpc

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2012-10-14 13:39:34 -07:00

sched

net: sched: integer overflow fix

2012-12-22 00:03:00 -08:00

sctp

sctp: fix Kconfig bug in default cookie hmac selection

2013-01-07 09:27:06 -08:00

sunrpc

Merge tag 'nfs-for-3.8-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

2013-01-11 12:09:04 -08:00

tipc

tipc: refactor accept() code for improved readability

2012-12-07 17:23:24 -05:00

unix

net: Don't export sysctls to unprivileged users

2012-11-18 20:30:55 -05:00

wanrouter

wanmain: comparing array with NULL

2012-07-24 13:55:21 -07:00

wimax

net: cleanup unsigned to unsigned int

2012-04-15 12:44:40 -04:00

wireless

net, wireless: overwrite default_ethtool_ops

2013-01-11 15:55:48 -08:00

x25

net: Fix (nearly-)kernel-doc comments for various functions

2012-07-10 23:13:45 -07:00

xfrm

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2012-11-22 15:25:55 -05:00

compat.c

make get_file() return its argument

2012-09-26 21:10:25 -04:00

Kconfig

net: Add INET dependency on aes crypto for the sake of TCP fastopen.

2012-09-04 14:20:14 -04:00

Makefile

ipv6: Preserve ipv6 functionality needed by NET

2012-11-18 02:34:00 -05:00

nonet.c

…

socket.c

cgroup: net_cls: Rework update socket logic

2012-10-26 03:40:51 -04:00

sysctl_net.c

user_ns: get rid of duplicate code in net_ctl_permissions

2012-11-18 20:32:45 -05:00