summaryrefslogtreecommitdiffstats
path: root/include/uapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2014-01-298-64/+64
|\
| * uapi: Use __kernel_long_t in struct mq_attrH.J. Lu2014-01-201-5/+5
| * uapi: Use __kernel_ulong_t in shmid64_ds/shminfo64/shm_infoH.J. Lu2014-01-202-17/+17
| * uapi: Use __kernel_ulong_t in struct msqid64_dsH.J. Lu2014-01-201-5/+5
| * uapi: Use __kernel_long_t in struct msgbufH.J. Lu2014-01-201-2/+2
| * uapi, asm-generic: Use __kernel_ulong_t in uapi struct ipc64_permH.J. Lu2014-01-201-2/+2
| * uapi: Use __kernel_long_t/__kernel_ulong_t in <linux/resource.h>H.J. Lu2014-01-201-16/+16
| * uapi: Use __kernel_long_t in struct timexH.J. Lu2014-01-201-17/+17
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-01-2526-43/+387
|\ \
| * | rtnetlink: remove IFLA_BOND_SLAVE definitionJiri Pirko2014-01-241-1/+0
| * | rtnetlink: add missing IFLA_BOND_AD_INFO_UNSPECJiri Pirko2014-01-231-0/+1
| * | rtnetlink: provide api for getting and setting slave infoJiri Pirko2014-01-221-0/+2
| * | rtnetlink: put "BOND" into nl attribute names which are related to bondingJiri Pirko2014-01-221-9/+10
| * | af_packet: Add Queue mapping mode to af_packet fanout operationNeil Horman2014-01-221-0/+1
| * | ipv6: add a flag to get the flow label used remotlyFlorent Fourcot2014-01-191-0/+1
| * | ipv6: add the IPV6_FL_F_REFLECT flag to IPV6_FL_A_GETFlorent Fourcot2014-01-191-0/+1
| * | net: introduce SO_BPF_EXTENSIONSMichal Sekletar2014-01-181-0/+2
| * | bonding: add netlink attributes to slave link devsfeldma@cumulusnetworks.com2014-01-171-0/+13
| * | net_sched: act: pick a different type for act_xtWANG Cong2014-01-161-0/+1
| * | ipv6 addrconf: add IFA_F_NOPREFIXROUTE flag to suppress creation of IP6 routesThomas Haller2014-01-151-0/+1
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-01-142-1/+4
| |\ \
| * | | tcp: metrics: New netlink attribute for src IP and dumped in netlink replyChristoph Paasch2014-01-101-0/+2
| * | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2014-01-102-0/+18
| |\ \ \
| | * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-01-102-0/+18
| | |\ \ \
| | | * \ \ Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-01-081-0/+1
| | | |\ \ \
| | | | * | | net: if_arp: add ARPHRD_6LOWPAN typeJukka Rissanen2013-12-111-0/+1
| | | * | | | cfg80211: Add support for QoS mappingKyeyoon Park2013-12-191-0/+14
| | | * | | | nl80211: support vendor-specific eventsJohannes Berg2013-12-191-0/+3
| * | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2014-01-102-0/+28
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | netfilter: introduce l2tp match extensionJames Chapman2014-01-092-0/+28
| * | | | | | netfilter: nft_ct: Add support to set the connmarkKristian Evensen2014-01-091-0/+2
| * | | | | | netfilter: nft_meta: add l4proto supportPatrick McHardy2014-01-071-0/+2
| * | | | | | netfilter: nf_tables: add nfproto support to meta expressionPatrick McHardy2014-01-071-0/+2
| * | | | | | netfilter: nf_tables: add "inet" table for IPv4/IPv6Patrick McHardy2014-01-071-0/+1
| |/ / / / /
| * | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/...David S. Miller2014-01-061-1/+13
| |\ \ \ \ \
| | * | | | | openvswitch: Drop user features if old user space attempted to create datapathThomas Graf2014-01-061-1/+9
| | * | | | | openvswitch: Allow user space to announce ability to accept unaligned Netlink...Thomas Graf2014-01-061-0/+4
| * | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-01-061-0/+1
| |\ \ \ \ \ \
| * | | | | | | net: pkt_sched: PIE AQM schemeVijay Subramanian2014-01-061-0/+25
| * | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2014-01-061-0/+24
| |\ \ \ \ \ \ \
| | * | | | | | | netfilter: nf_tables: nft_meta module get/set opsArturo Borrero Gonzalez2013-12-281-0/+2
| | * | | | | | | netfilter: nf_tables: Expose the table usage counter via netlinkTomasz Bursztyka2013-12-171-0/+2
| | * | | | | | | netfilter: nft: add queue moduleEric Leblond2013-12-071-0/+20
| * | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-01-055-5/+41
| |\ \ \ \ \ \ \ \
| | * | | | | | | | netfilter: x_tables: lightweight process control group matchingDaniel Borkmann2014-01-032-0/+12
| | * | | | | | | | netfilter: nf_nat: add full port randomization supportDaniel Borkmann2014-01-031-4/+8
| | * | | | | | | | netfilter: add IPv4/6 IPComp extension match supportfan.du2013-12-242-0/+17
| | * | | | | | | | netfilter: nfnetlink_queue: enable UID/GID socket info retrievalValentina Giusti2013-12-211-1/+4
| * | | | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2014-01-041-0/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | pci_regs.h: Add PCI bus link speed and width definesJeff Kirsher2014-01-031-0/+5
OpenPOWER on IntegriCloud