summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2012-10-0243-133/+276
|\
| * userns: Convert the audit loginuid to be a kuidEric W. Biederman2012-09-186-16/+16
| * userns: net: Call key_alloc with GLOBAL_ROOT_UID, GLOBAL_ROOT_GID instead of ...Eric W. Biederman2012-09-142-3/+6
| * ipv6: move dereference after check in fl_free()Dan Carpenter2012-08-171-5/+2Star
| * userns: xt_owner: Add basic user namespace support.Eric W. Biederman2012-08-151-6/+24
| * userns xt_recent: Specify the owner/group of ip_list_perms in the initial use...Eric W. Biederman2012-08-151-2/+11
| * userns: Convert xt_LOG to print socket kuids and kgids as uids and gidsEric W. Biederman2012-08-151-6/+10
| * userns: Convert cls_flow to work with user namespaces enabledEric W. Biederman2012-08-151-4/+12
| * net sched: Pass the skb into change so it can access NETLINK_CBEric W. Biederman2012-08-159-9/+17
| * userns: nfnetlink_log: Report socket uids in the log sockets user namespaceEric W. Biederman2012-08-151-4/+10
| * userns: Teach inet_diag to work with user namespacesEric W. Biederman2012-08-152-7/+19
| * netlink: Make the sending netlink socket availabe in NETLINK_CBEric W. Biederman2012-08-151-2/+4
| * userns: Convert net/ax25 to use kuid_t where appropriateEric W. Biederman2012-08-151-7/+14
| * net ip6 flowlabel: Make owner a union of struct pid * and kuid_tEric W. Biederman2012-08-151-7/+43
| * userns: Use kgids for sysctl_ping_group_rangeEric W. Biederman2012-08-152-27/+33
| * userns: Print out socket uids in a user namespace aware fashion.Eric W. Biederman2012-08-1514-20/+34
| * userns: Convert sock_i_uid to return a kuid_tEric W. Biederman2012-08-151-3/+3
| * userns: Convert __dev_set_promiscuity to use kuids in audit logsEric W. Biederman2012-08-151-3/+4
| * userns: Convert net/core/scm.c to use kuids and kgidsEric W. Biederman2012-08-152-10/+25
* | Merge branch 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-10-022-1/+20
|\ \
| * | cgroup: mark subsystems with broken hierarchy support and whine if cgroups ar...Tejun Heo2012-09-142-1/+20
* | | Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cg...Linus Torvalds2012-10-023-35/+4Star
|\ \ \
| * | | cgroup: Assign subsystem IDs during compile timeDaniel Wagner2012-09-143-35/+0Star
| * | | cgroup: net_prio: Do not define task_netpioidx() when not selectedDaniel Wagner2012-09-141-0/+2
| * | | cgroup: net_cls: Do not define task_cls_classid() when not selectedDaniel Wagner2012-09-141-0/+2
* | | | Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2012-10-028-24/+14Star
|\ \ \ \
| * | | | workqueue: use mod_delayed_work() instead of __cancel + queueTejun Heo2012-08-211-15/+6Star
| * | | | workqueue: make deferrable delayed_work initializer names consistentTejun Heo2012-08-213-3/+3
| * | | | workqueue: deprecate flush[_delayed]_work_sync()Tejun Heo2012-08-202-2/+2
| * | | | workqueue: use mod_delayed_work() instead of cancel + queueTejun Heo2012-08-142-4/+3Star
| | |_|/ | |/| |
* | | | Merge tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/ttyLinus Torvalds2012-10-015-203/+205
|\ \ \ \
| * \ \ \ Merge 3.6-rc6 into tty-nextGreg Kroah-Hartman2012-09-1750-186/+291
| |\ \ \ \
| * | | | | serial: add a new helper functionHuang Shijie2012-09-052-3/+3
| * | | | | Merge 3.6-rc3 into tty-nextGreg Kroah-Hartman2012-08-2775-310/+686
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | TTY: ircomm_tty, add tty installJiri Slaby2012-08-141-16/+25
| * | | | | TTY: use tty_port_register_deviceJiri Slaby2012-08-141-2/+2
| * | | | | tty: localise the lockAlan Cox2012-08-101-2/+2
| * | | | | Merge tty-next into 3.6-rc1Greg Kroah-Hartman2012-08-06448-17668/+25490
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | tty: move the termios object into the ttyAlan Cox2012-07-163-12/+12
| * | | | | tty: revert incorrectly applied lock patchAlan Cox2012-07-161-2/+2
| * | | | | Merge branch 'v3.6-rc7' into tty-nextGreg Kroah-Hartman2012-07-1651-147/+281
| |\ \ \ \ \
| * | | | | | tty: localise the lockAlan Cox2012-07-061-2/+2
| * | | | | | Merge 3.5-rc4 into tty-nextGreg Kroah-Hartman2012-06-2735-174/+246
| |\ \ \ \ \ \
| * | | | | | | TTY: ircomm, use tty_port_close_start helperJiri Slaby2012-06-131-47/+1Star
| * | | | | | | TTY: ircomm, use tty_port_close_end helperJiri Slaby2012-06-131-15/+1Star
| * | | | | | | TTY: ircomm, define carrier routinesJiri Slaby2012-06-131-10/+33
| * | | | | | | TTY: ircomm, define local tty_portJiri Slaby2012-06-131-53/+56
| * | | | | | | TTY: ircomm, use tty from tty_portJiri Slaby2012-06-134-41/+70
| * | | | | | | TTY: ircomm, revamp lockingJiri Slaby2012-06-131-20/+18Star
| * | | | | | | TTY: ircomm, use flags from tty_portJiri Slaby2012-06-133-30/+31