1
0
Fork 0
alistair23-linux/include/uapi/linux
David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/altera/altera_sgdma.c
	net/netlink/af_netlink.c
	net/sched/cls_api.c
	net/sched/sch_api.c

The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces.  These were simple transformations from
netlink_capable to netlink_ns_capable.

The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-12 13:19:14 -04:00
..
byteorder UAPI: (Scripted) Disintegrate include/linux/byteorder 2012-10-13 10:46:49 +01:00
caif caif: Remove my bouncing email address. 2013-04-23 13:25:51 -04:00
can can: allow to change the device mtu for CAN FD capable devices 2014-03-07 09:18:23 +01:00
cifs cifs: Move and expand MAX_SERVER_SIZE definition 2013-09-08 14:34:22 -05:00
dvb [media] demux.h: Remove duplicated enum 2013-04-08 06:53:15 -03:00
genwqe GenWQE PCI support, health monitoring and recovery 2013-12-18 16:51:15 -08:00
hdlc Fix the wanxl firmware to include missing constants 2012-11-09 16:28:37 -05:00
hsi UAPI: (Scripted) Disintegrate include/linux/hsi 2012-10-09 09:48:44 +01:00
isdn UAPI: (Scripted) Disintegrate include/linux/isdn 2012-10-09 09:48:45 +01:00
mmc UAPI: (Scripted) Disintegrate include/linux/mmc 2012-10-11 17:27:54 -04:00
netfilter netfilter: ipset: add forceadd kernel support for hash set types 2014-03-06 09:31:43 +01:00
netfilter_arp UAPI: (Scripted) Disintegrate include/linux/netfilter_arp 2012-10-09 09:48:56 +01:00
netfilter_bridge uapi: Convert some uses of 6 to ETH_ALEN 2013-08-02 12:33:54 -07:00
netfilter_ipv4 uapi: Convert some uses of 6 to ETH_ALEN 2013-08-02 12:33:54 -07:00
netfilter_ipv6 netfilter: fix struct ip6t_frag field description 2013-04-02 12:25:57 +02:00
nfsd UAPI: (Scripted) Disintegrate include/linux/nfsd 2012-10-09 09:49:02 +01:00
raid md: Change handling of save_raid_disk and metadata update during recovery. 2014-01-14 16:44:21 +11:00
spi spi: spidev: Add support for Dual/Quad SPI Transfers 2014-02-27 13:51:29 +09:00
sunrpc UAPI: (Scripted) Disintegrate include/linux/sunrpc 2012-10-09 09:49:04 +01:00
tc_act net_sched: act: pick a different type for act_xt 2014-01-16 17:24:11 -08:00
tc_ematch UAPI: (Scripted) Disintegrate include/linux/tc_ematch 2012-10-09 09:49:06 +01:00
usb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2014-04-02 20:53:45 -07:00
wimax uapi: Convert some uses of 6 to ETH_ALEN 2013-08-02 12:33:54 -07:00
Kbuild hv: Add hyperv.h to uapi headers 2014-02-07 15:18:31 -08:00
a.out.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
acct.h UAPI: fix endianness conditionals in linux/acct.h 2013-03-13 15:21:48 -07:00
adb.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
adfs_fs.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
affs_hardblocks.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
agpgart.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
aio_abi.h UAPI: fix endianness conditionals in linux/aio_abi.h 2013-03-13 15:21:48 -07:00
apm_bios.h apm-emulation: add hibernation APM events to support suspend2disk 2014-01-07 13:50:28 +01:00
arcfb.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atalk.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atm.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atm_eni.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atm_he.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atm_idt77105.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atm_nicstar.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atm_tcp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atm_zatm.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atmapi.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atmarp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atmbr2684.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atmclip.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atmdev.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atmioc.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atmlec.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atmmpc.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atmppp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atmsap.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
atmsvc.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
audit.h audit: add netlink multicast group for log read 2014-04-22 21:42:27 -04:00
auto_fs.h unbreak automounter support on 64-bit kernel with 32-bit userspace (v2) 2013-02-08 20:42:18 +01:00
auto_fs4.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
auxvec.h powerpc: Add HWCAP2 aux entry 2013-04-26 16:08:16 +10:00
ax25.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
b1lli.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
baycom.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
bcache.h bcache: Add bch_btree_keys_u64s_remaining() 2014-01-08 13:05:13 -08:00
bcm933xx_hcs.h MIPS: BCM63XX: recognize Cable Modem firmware format 2013-07-01 15:10:53 +02:00
bfs_fs.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
binfmts.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
blkpg.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
blktrace_api.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
bpqether.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
bsg.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
btrfs.h Revert "btrfs: add ioctl to export size of global metadata reservation" 2014-02-14 13:42:13 -08:00
can.h can: add explicit copyrights to can userspace header 2014-02-04 09:34:33 +01:00
capability.h audit: add netlink audit protocol bind to check capabilities on multicast join 2014-04-22 21:42:27 -04:00
capi.h isdn: capi: fix "CAPI_VERSION" comment 2014-03-20 14:55:18 +01:00
cciss_defs.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
cciss_ioctl.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
cdrom.h libata: identify and init ZPODD devices 2013-01-21 15:40:35 -05:00
cgroupstats.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
chio.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
cm4000_cs.h Omnikey Cardman 4000: pull in ioctl.h in user header 2013-08-28 19:26:38 -07:00
cn_proc.h connector: Added coredumping event to the process connector 2013-03-20 13:23:21 -04:00
coda.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
coda_psdev.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
coff.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
connector.h Drivers: hv: Add a new driver to support host initiated backup 2013-03-15 12:12:36 -07:00
const.h linux/const.h: Add _BITUL() and _BITULL() 2013-06-25 15:50:04 -07:00
cramfs_fs.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
cuda.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
cyclades.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
cycx_cfm.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
dcbnl.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
dccp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
dlm.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
dlm_device.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
dlm_netlink.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
dlm_plock.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
dlmconstants.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
dm-ioctl.h dm: allow remove to be deferred 2013-11-09 18:20:22 -05:00
dm-log-userspace.h dm log userspace: allow mark requests to piggyback on flush requests 2014-01-21 23:46:27 -05:00
dn.h include/uapi/linux/dn.h: pull in ioctl.h header 2014-01-23 16:36:55 -08:00
dqblk_xfs.h quota: Add a new quotactl command Q_XGETQSTATV 2013-08-20 16:53:58 -05:00
edd.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
efs_fs_sb.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
elf-em.h Drop remaining references to H8/300 architecture 2013-09-16 18:20:24 -07:00
elf-fdpic.h FRV: Fix linux/elf-fdpic.h 2012-10-16 18:49:15 -07:00
elf.h metag: ptrace: Implement NT_METAG_TLS 2013-03-27 14:37:47 +00:00
elfcore.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
errno.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
errqueue.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ethtool.h ethtool: Support for configurable RSS hash key 2014-04-22 21:27:57 -04:00
eventpoll.h epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled 2013-12-03 15:35:52 +01:00
fadvise.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
falloc.h fs: Introduce FALLOC_FL_ZERO_RANGE flag for fallocate 2014-03-13 19:07:42 +11:00
fanotify.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
fb.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
fcntl.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
fd.h floppy: bail out in open() if drive is not responding to block0 read 2014-01-17 11:12:06 +01:00
fdreg.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
fib_rules.h fib_rules: fix suppressor names and default values 2013-08-03 10:40:23 -07:00
fiemap.h ext4: add support for extent pre-caching 2013-08-16 22:05:14 -04:00
filter.h filter: added BPF random opcode 2014-04-22 21:27:57 -04:00
firewire-cdev.h firewire: fix libdc1394/FlyCap2 iso event regression 2013-07-27 20:24:36 +02:00
firewire-constants.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
flat.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
fs.h vfs: add cross-rename 2014-04-01 17:08:43 +02:00
fsl_hypervisor.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
fuse.h fuse: Turn writeback cache on 2014-04-02 15:38:50 +02:00
futex.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
gameport.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
gen_stats.h net_sched: add 64bit rate estimators 2013-06-11 02:51:03 -07:00
genetlink.h genetlink/pmcraid: use proper genetlink multicast API 2013-11-28 18:26:30 -05:00
gfs2_ondisk.h GFS2: Add meta readahead field in directory entries 2014-02-07 11:23:22 +00:00
gigaset_dev.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
hash_info.h crypto: provide single place for hash algo information 2013-10-25 17:14:03 -04:00
hdlc.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
hdlcdrv.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
hdreg.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
hid.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
hiddev.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
hidraw.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
hpet.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
hsr_netlink.h net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0) 2013-11-03 23:20:14 -05:00
hw_breakpoint.h perf: Make perf build for x86 with UAPI disintegration applied 2012-11-19 22:21:03 +00:00
hyperv.h Tools: hv: Handle the case when the target file exists correctly 2014-04-16 14:10:36 -07:00
hysdn_if.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
i2c-dev.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
i2c.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
i2o-dev.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
i8k.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
icmp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
icmpv6.h ICMPv6: treat dest unreachable codes 5 and 6 as EACCES, not EPROTO 2013-09-03 22:11:44 -04:00
if.h net: move net_device priv_flags out from UAPI 2014-02-27 15:59:09 -05:00
if_addr.h ipv6 addrconf: add IFA_F_NOPREFIXROUTE flag to suppress creation of IP6 routes 2014-01-15 17:00:40 -08:00
if_addrlabel.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_alg.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_arcnet.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_arp.h net: if_arp: add ARPHRD_6LOWPAN type 2013-12-11 12:57:55 -08:00
if_bonding.h bonding: modify the old and add new xmit hash policies 2013-10-03 15:36:38 -04:00
if_bridge.h uapi: Convert some uses of 6 to ETH_ALEN 2013-08-02 12:33:54 -07:00
if_cablemodem.h if_cablemodem.h: Add parenthesis around ioctl macros 2013-05-08 13:13:30 -07:00
if_eql.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_ether.h ether: add loopback type ETH_P_LOOPBACK 2014-03-14 22:20:57 -04:00
if_fc.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_fddi.h FDDI: Reformat <linux/if_fddi.h> for 8-character tabs 2014-04-27 19:08:06 -04:00
if_frad.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_hippi.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_infiniband.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_link.h net-sysfs: expose number of carrier on/off changes 2014-03-31 16:24:52 -04:00
if_ltalk.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_packet.h af_packet: Add Queue mapping mode to af_packet fanout operation 2014-01-22 17:35:50 -08:00
if_phonet.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_plip.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_ppp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_pppol2tp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_pppox.h pptp: fix byte order warnings 2013-08-13 15:10:22 -07:00
if_slip.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_team.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
if_tun.h tun: Get skfilter layout 2013-08-21 12:21:45 -07:00
if_tunnel.h sit: allow to configure 6rd tunnels via netlink 2012-11-20 13:43:28 -05:00
if_vlan.h net/8021q: Implement Multiple VLAN Registration Protocol (MVRP) 2013-02-10 20:37:22 -05:00
if_x25.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
igmp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
in.h ipv4: yet another new IP_MTU_DISCOVER option IP_PMTUDISC_OMIT 2014-02-26 15:51:00 -05:00
in6.h ipv6: yet another new IPV6_MTU_DISCOVER option IPV6_PMTUDISC_OMIT 2014-02-26 15:51:01 -05:00
in_route.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
inet_diag.h sock-diag: Report shutdown for inet and unix sockets (v2) 2012-10-23 14:57:52 -04:00
inotify.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
input.h Input: Add INPUT_PROP_TOPBUTTONPAD device property 2014-04-19 22:44:13 -07:00
ioctl.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ip.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-08-26 16:37:08 -04:00
ip6_tunnel.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ip_vs.h ipvs: fix the IPVS_CMD_ATTR_MAX definition 2013-10-15 10:36:01 +09:00
ipc.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ipmi.h ipmi: remove superfluous kernel/userspace explanation 2013-02-27 19:10:21 -08:00
ipmi_msgdefs.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ipsec.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ipv6.h ipv6: drop fragmented ndisc packets by default (RFC 6980) 2013-08-29 15:32:08 -04:00
ipv6_route.h ipv6: export IP6_RT_PRIO_* to userland 2012-11-16 01:47:40 -05:00
ipx.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
irda.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
irqnr.h UAPI: Make uapi/linux/irqnr.h non-empty 2012-10-17 12:31:15 +01:00
isdn.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
isdn_divertif.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
isdn_ppp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
isdnif.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
iso_fs.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ivtv.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ivtvfb.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ixjuser.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
jffs2.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
joystick.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
kd.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
kdev_t.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
kernel-page-flags.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
kernel.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
kernelcapi.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
kexec.h m68k: Add kexec support 2013-12-08 11:01:47 +01:00
keyboard.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
keyctl.h KEYS: Add per-user_namespace registers for persistent per-UID kerberos caches 2013-09-24 10:35:19 +01:00
kvm.h KVM: s390: irq routing for adapter interrupts. 2014-03-21 13:43:00 +01:00
kvm_para.h kvm uapi: Add KICK_CPU and PV_UNHALT definition to uapi 2013-08-26 12:46:01 +03:00
l2tp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
libc-compat.h xattr: guard against simultaneous glibc header inclusion 2014-04-03 16:21:06 -07:00
limits.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
llc.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
loop.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
lp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
magic.h Btrfs: add tests for find_lock_delalloc_range 2013-11-11 21:56:51 -05:00
major.h mtd: Move major number definitions to major.h 2013-11-06 23:32:59 -08:00
map_to_7segment.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
matroxfb.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
mdio.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
media.h [media] media: Add pad flag MEDIA_PAD_FL_MUST_CONNECT 2013-12-04 14:59:20 -02:00
mei.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
mempolicy.h mm: numa: Migrate on reference policy 2012-12-11 14:42:48 +00:00
meye.h [media] meye: convert to the control framework 2013-02-05 18:23:47 -02:00
mic_common.h misc: mic: Fix endianness issues. 2013-11-27 11:03:38 -08:00
mic_ioctl.h misc: mic: fix possible signed underflow (undefined behavior) in userspace API 2014-02-07 15:30:34 -08:00
mii.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
minix_fs.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
mman.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
mmtimer.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
module.h module: add flags arg to sys_finit_module() 2012-12-14 13:05:23 +10:30
mpls.h UAPI: add MPLS label stack definition 2014-03-04 13:51:06 -05:00
mqueue.h uapi: Use __kernel_long_t in struct mq_attr 2014-01-20 14:45:33 -08:00
mroute.h mcast: add multicast proxy support (IPv4 and IPv6) 2013-01-21 13:55:14 -05:00
mroute6.h mcast: add multicast proxy support (IPv4 and IPv6) 2013-01-21 13:55:14 -05:00
msdos_fs.h fatfs: add FAT_IOCTL_GET_VOLUME_ID 2013-07-09 10:33:25 -07:00
msg.h uapi: Use __kernel_long_t in struct msgbuf 2014-01-20 14:44:50 -08:00
mtio.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
n_r3964.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
nbd.h nbd: support FLUSH requests 2013-02-27 19:10:22 -08:00
ncp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ncp_fs.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ncp_mount.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ncp_no.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
neighbour.h neighbour.h: fix comment 2014-01-22 10:34:15 +01:00
net.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
net_dropmon.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
net_tstamp.h net_tstamp: Add SIOCGHWTSTAMP ioctl to match SIOCSHWTSTAMP 2013-11-19 19:07:21 +00:00
netconf.h netconf: rename PROXY_ARP to NEIGH_PROXY 2013-12-22 18:02:43 -05:00
netdevice.h net: export NET_ADDR_* values to user-space API 2014-03-31 16:09:06 -04:00
netfilter.h netfilter: nf_tables: add "inet" table for IPv4/IPv6 2014-01-07 23:57:25 +01:00
netfilter_arp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
netfilter_bridge.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
netfilter_decnet.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
netfilter_ipv4.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
netfilter_ipv6.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
netlink.h netlink: mmaped netlink: ring setup 2013-04-19 14:57:57 -04:00
netlink_diag.h diag: warn about missing first netlink attribute 2013-11-28 18:16:43 -05:00
netrom.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
nfc.h NFC: Add ISO/IEC 15693 header definitions 2014-02-16 23:49:53 +01:00
nfs.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
nfs2.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
nfs3.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
nfs4.h uapi: convert u64 to __u64 in exported headers 2014-01-23 16:36:55 -08:00
nfs4_mount.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
nfs_fs.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
nfs_idmap.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
nfs_mount.h NFS: stop using NFS_MOUNT_SECFLAVOUR server flag 2013-10-28 15:37:56 -04:00
nfsacl.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
nl80211.h cfg80211: Dynamic channel bandwidth changes in AP mode 2014-04-28 18:09:59 +02:00
nubus.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
nvme.h NVMe: Retry failed commands with non-fatal errors 2014-04-10 17:11:59 -04:00
nvram.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
omap3isp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
omapfb.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
oom.h mm, oom: reintroduce /proc/pid/oom_adj 2012-11-16 10:15:35 -08:00
openvswitch.h openvswitch: Drop user features if old user space attempted to create datapath 2014-01-06 15:53:00 -08:00
packet_diag.h diag: warn about missing first netlink attribute 2013-11-28 18:16:43 -05:00
param.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
parport.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
patchkey.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
pci.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
pci_regs.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2014-01-25 11:17:34 -08:00
perf_event.h uapi: convert u64 to __u64 in exported headers 2014-01-23 16:36:55 -08:00
personality.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
pfkeyv2.h ipsec: add support of limited SA dump 2014-02-17 07:18:19 +01:00
pg.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
phantom.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
phonet.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
pkt_cls.h net: sched: cls_bpf: add BPF-based classifier 2013-10-29 17:33:17 -04:00
pkt_sched.h net: pkt_sched: PIE AQM scheme 2014-01-06 15:13:01 -05:00
pktcdvd.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
pmu.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
poll.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
posix_types.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ppdev.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ppp-comp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ppp-ioctl.h include/uapi/linux/ppp-ioctl.h: pull in ppp_defs.h 2014-01-23 16:36:55 -08:00
ppp_defs.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
pps.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
prctl.h mm, thp: add VM_INIT_DEF_MASK and PRCTL_THP_DISABLE 2014-04-07 16:35:52 -07:00
ptp_clock.h ptp: introduce programmable pins. 2014-03-21 14:21:13 -04:00
ptrace.h ptrace: add ability to get/set signal-blocked mask 2013-07-03 16:08:01 -07:00
qnx4_fs.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
qnxtypes.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
quota.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
radeonfb.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
random.h random32: move rnd_state to linux/random.h 2013-11-11 14:32:14 -05:00
raw.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
rds.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
reboot.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
reiserfs_fs.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
reiserfs_xattr.h xattr: Constify ->name member of "struct xattr". 2013-07-25 19:30:03 +10:00
resource.h uapi: Use __kernel_long_t/__kernel_ulong_t in <linux/resource.h> 2014-01-20 14:44:17 -08:00
rfkill.h rfkill: Add NFC to the list of supported radios 2013-04-12 16:54:38 +02:00
romfs_fs.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
rose.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
route.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
rtc.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
rtnetlink.h tcp: introduce a per-route knob for quick ack 2013-06-19 23:06:51 -07:00
scc.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
sched.h sched: Move SCHED_RESET_ON_FORK into attr::sched_flags 2014-01-16 09:27:17 +01:00
screen_info.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
sctp.h sctp: Fix FSF address in file headers 2013-12-06 12:37:56 -05:00
sdla.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
seccomp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
securebits.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
selinux_netlink.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
sem.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
serial.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
serial_core.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 2013-09-06 11:14:33 -07:00
serial_reg.h Revert "OMAP: UART: Keep the TX fifo full when possible" 2013-08-27 16:02:18 -07:00
serio.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
shm.h uapi: Use __kernel_ulong_t in shmid64_ds/shminfo64/shm_info 2014-01-20 14:45:25 -08:00
signal.h unify SS_ONSTACK/SS_DISABLE definitions 2012-12-19 18:07:39 -05:00
signalfd.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
snmp.h tcp: snmp stats for Fast Open, SYN rtx, and data pkts 2014-03-03 15:58:03 -05:00
sock_diag.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
socket.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
sockios.h net_tstamp: Add SIOCGHWTSTAMP ioctl to match SIOCSHWTSTAMP 2013-11-19 19:07:21 +00:00
som.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
sonet.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
sonypi.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
sound.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
soundcard.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
stat.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
stddef.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
string.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
suspend_ioctls.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
swab.h byteorder: allow arch to opt to use GCC intrinsics for byteswapping 2012-12-06 01:22:31 +00:00
synclink.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
sysctl.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
sysinfo.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
taskstats.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
tcp.h tcp: add pacing_rate information into tcp_info 2014-02-14 16:09:43 -05:00
tcp_metrics.h tcp: switch rtt estimations to usec resolution 2014-02-26 17:08:40 -05:00
telephony.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
termios.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
time.h timekeeping: Add CLOCK_TAI clockid 2013-03-22 16:19:59 -07:00
times.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
timex.h uapi: Use __kernel_long_t in struct timex 2014-01-20 14:44:05 -08:00
tiocl.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
tipc.h tipc: add ioctl to fetch link names 2014-04-26 12:13:24 -04:00
tipc_config.h tipc: add ioctl to fetch link names 2014-04-26 12:13:24 -04:00
toshiba.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
tty.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
tty_flags.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
types.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
udf_fs_i.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
udp.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
uhid.h HID: uhid: Add UHID_CREATE2 + UHID_INPUT2 2014-04-01 18:27:33 +02:00
uinput.h Input: uinput - add UI_GET_SYSNAME ioctl to retrieve the sysfs path 2014-02-12 15:00:34 -08:00
uio.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
ultrasound.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
un.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
unistd.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
unix_diag.h diag: warn about missing first netlink attribute 2013-11-28 18:16:43 -05:00
usbdevice_fs.h usbfs: Add support for allocating / freeing streams 2014-03-04 15:38:05 -08:00
utime.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
utsname.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
uuid.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
uvcvideo.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
v4l2-common.h [media] v4l2-common: fix warning when used on userpace 2014-04-06 11:06:37 -03:00
v4l2-controls.h [media] v4l: add control for RF tuner PLL lock flag 2014-03-13 10:26:49 -03:00
v4l2-dv-timings.h [media] v4l2-dv-timings.h: add new 4K DMT resolutions 2014-02-04 10:01:28 -02:00
v4l2-mediabus.h [media] v4l: Add media format codes for AHSV8888 on 32-bit busses 2013-12-11 09:21:37 -02:00
v4l2-subdev.h [media] v4l2: allow v4l2_subdev_edid to be used with video nodes 2014-03-11 10:05:53 -03:00
veth.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
vfio.h vfio/type1: Add extension to test DMA cache coherence of IOMMU 2014-02-26 11:38:37 -07:00
vhost.h tcm_vhost: header split up 2013-05-02 13:40:15 +03:00
videodev2.h [media] videodev2.h: add parenthesis around macro arguments 2014-03-28 18:08:22 -03:00
virtio_9p.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
virtio_balloon.h virtio: do not export "u16" and "u64" to userspace 2013-04-02 16:42:58 +10:30
virtio_blk.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
virtio_config.h virtio: VIRTIO_F_ANY_LAYOUT feature 2013-07-09 10:47:45 +09:30
virtio_console.h Simple warning fix for module sections. If too late to pull, no big deal. 2013-07-03 13:09:06 -07:00
virtio_ids.h caif_virtio: Introduce caif over virtio 2013-03-20 14:06:06 +10:30
virtio_net.h uapi: Convert some uses of 6 to ETH_ALEN 2013-08-02 12:33:54 -07:00
virtio_pci.h virtio_pci: better macro exported in uapi 2013-05-20 12:08:09 +09:30
virtio_ring.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
virtio_rng.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
vm_sockets.h VSOCK: Split vm_sockets.h into kernel/uapi 2013-03-08 12:24:48 -05:00
vsp1.h [media] v4l: vsp1: Add LUT support 2013-12-11 09:25:20 -02:00
vt.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
wait.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
wanrouter.h wanrouter: delete now orphaned header content, files/drivers 2013-01-31 19:56:35 -05:00
watchdog.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
wimax.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
wireless.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
x25.h UAPI: (Scripted) Disintegrate include/linux 2012-10-13 10:46:48 +01:00
xattr.h xattr: guard against simultaneous glibc header inclusion 2014-04-03 16:21:06 -07:00
xfrm.h xfrm: rename struct xfrm_filter 2014-03-07 08:12:37 +01:00
zorro.h zorro/UAPI: Use proper types (endianness/size) in <linux/zorro.h> 2013-11-26 11:09:09 +01:00
zorro_ids.h zorro/UAPI: Disintegrate include/linux/zorro*.h 2013-11-26 11:09:08 +01:00