Linus Torvalds a99abce2d9 Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit ... Pull audit updates from Paul Moore: "Two small patches from the audit next branch; only one of which has any real significant code changes, the other is simply a MAINTAINERS update for audit. The single code patch is pretty small and rather straightforward, it changes the audit "version" number reported to userspace from an integer to a bitmap which is used to indicate the functionality of the running kernel. This really doesn't have much impact on the kernel, but it will make life easier for the audit userspace folks. Thankfully we were still on a version number which allowed us to do this without breaking userspace" * 'upstream' of git://git.infradead.org/users/pcmoore/audit: audit: convert status version to a feature bitmap audit: add Paul Moore to the MAINTAINERS entry		2014-12-13 13:41:28 -08:00
..
byteorder
caif
can	can: dev: Consolidate and unify state change handling	2014-12-07 21:22:09 +01:00
cifs
dvb
genwqe	GenWQE: Update author information	2014-09-23 23:15:46 -07:00
hdlc
hsi
isdn
mmc
netfilter	netfilter: ipset: Alignment problem between 64bit kernel 32bit userspace	2014-12-03 12:43:35 +01:00
netfilter_arp	uapi: netfilter_arp: use __u8 instead of u_int8_t	2014-08-20 15:13:08 +02:00
netfilter_bridge	netfilter: kill ulog targets	2014-06-25 19:28:43 +02:00
netfilter_ipv4	netfilter: kill ulog targets	2014-06-25 19:28:43 +02:00
netfilter_ipv6
nfsd	sunrpc: eliminate RPC_DEBUG	2014-11-24 17:31:46 -05:00
raid	md: discard PRINT_RAID_DEBUG ioctl	2014-10-14 13:08:29 +11:00
spi
sunrpc
tc_act	tc_act: export uapi header file	2014-12-09 13:34:10 -05:00
tc_ematch
usb	usb: gadget: f_fs: virtual endpoint address mapping	2014-09-16 09:58:21 -05:00
wimax
a.out.h
acct.h
adb.h
adfs_fs.h
affs_hardblocks.h
agpgart.h
aio_abi.h
apm_bios.h
arcfb.h
atalk.h
atm_eni.h
atm_he.h
atm_idt77105.h
atm_nicstar.h
atm_tcp.h
atm_zatm.h
atm.h
atmapi.h
atmarp.h
atmbr2684.h
atmclip.h
atmdev.h
atmioc.h
atmlec.h
atmmpc.h
atmppp.h
atmsap.h
atmsvc.h
audit.h	Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit	2014-12-13 13:41:28 -08:00
auto_fs4.h
auto_fs.h
auxvec.h
ax25.h
b1lli.h
baycom.h
bcache.h
bcm933xx_hcs.h
bfs_fs.h
binfmts.h
blkpg.h
blktrace_api.h
bpf_common.h	net: filter: move common defines into bpf_common.h	2014-10-14 16:06:45 -04:00
bpf.h	bpf: verifier: add checks for BPF_ABS | BPF_IND instructions	2014-12-05 21:47:32 -08:00
bpqether.h
bsg.h	block SG_IO: add SG_FLAG_Q_AT_HEAD flag	2014-07-01 10:48:05 -06:00
btrfs.h	Btrfs: return failure if btrfs_dev_replace_finishing() failed	2014-11-20 17:14:28 -08:00
can.h	can: unify identifiers to ensure unique include processing	2014-05-19 09:38:24 +02: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
cciss_defs.h
cciss_ioctl.h
cdrom.h
cgroupstats.h
chio.h
cm4000_cs.h
cn_proc.h
coda_psdev.h
coda.h
coff.h
connector.h
const.h
cramfs_fs.h
cuda.h
cyclades.h
cycx_cfm.h
dcbnl.h	dcbnl : Fix misleading dcb_app->priority explanation	2014-07-30 17:21:05 -07:00
dccp.h
dlm_device.h
dlm_netlink.h
dlm_plock.h
dlm.h
dlmconstants.h	dlm: adopt orphan locks	2014-11-19 14:48:02 -06:00
dm-ioctl.h	dm: enhance internal suspend and resume interface	2014-11-19 12:31:17 -05:00
dm-log-userspace.h
dn.h
dqblk_xfs.h
edd.h
efs_fs_sb.h
elf-em.h	Add ELF machine define for Nios2	2014-12-08 12:55:57 +08:00
elf-fdpic.h
elf.h	arm64: ptrace: add NT_ARM_SYSTEM_CALL regset	2014-11-28 10:19:49 +00:00
elfcore.h
errno.h
errqueue.h	net-timestamp: ACK timestamp for bytestreams	2014-08-05 16:35:54 -07:00
ethtool.h	ethtool: Support for configurable RSS hash function	2014-12-08 21:07:10 -05:00
eventpoll.h
fadvise.h
falloc.h
fanotify.h
fb.h
fcntl.h	shm: add sealing API	2014-08-08 15:57:31 -07:00
fd.h
fdreg.h
fib_rules.h
fiemap.h
filter.h	net: filter: move common defines into bpf_common.h	2014-10-14 16:06:45 -04:00
firewire-cdev.h
firewire-constants.h
flat.h
fou.h	gue: Receive side for Generic UDP Encapsulation	2014-10-03 16:53:33 -07:00
fs.h	vfs: add RENAME_WHITEOUT	2014-10-24 00:14:37 +02:00
fsl_hypervisor.h
fuse.h	fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT	2014-07-22 16:37:43 +02:00
futex.h
gameport.h
gen_stats.h
genetlink.h
gfs2_ondisk.h	GFS2: remove transaction glock	2014-05-14 10:04:34 +01:00
gigaset_dev.h
hash_info.h
hdlc.h
hdlcdrv.h
hdreg.h
hid.h
hiddev.h
hidraw.h
hpet.h
hsr_netlink.h
hw_breakpoint.h
hyperv.h	Drivers: hv: util: Properly pack the data for file copy functionality	2014-09-23 23:31:21 -07:00
hysdn_if.h
i2c-dev.h
i2c.h
i2o-dev.h
i8k.h	i8k: uapi: Introduce define for new highest fan speed	2014-07-09 16:41:36 -07:00
icmp.h
icmpv6.h
if_addr.h
if_addrlabel.h
if_alg.h	crypto: af_alg - add user space interface for AEAD	2014-12-05 23:56:55 +08:00
if_arcnet.h
if_arp.h
if_bonding.h
if_bridge.h	bridge: remove mode BRIDGE_MODE_SWDEV	2014-12-09 18:24:47 -05:00
if_cablemodem.h
if_eql.h
if_ether.h	net: dsa: reduce number of protocol hooks	2014-08-27 22:59:39 -07:00
if_fc.h
if_fddi.h	FDDI: Reformat <linux/if_fddi.h> for 8-character tabs	2014-04-27 19:08:06 -04:00
if_frad.h
if_hippi.h
if_infiniband.h
if_link.h	bridge: add new brport flag LEARNING_SYNC	2014-12-02 20:01:23 -08:00
if_ltalk.h
if_packet.h	packet: remove deprecated syststamp timestamp	2014-07-29 11:39:50 -07:00
if_phonet.h
if_plip.h
if_ppp.h
if_pppol2tp.h
if_pppox.h
if_slip.h
if_team.h
if_tun.h	tun: add VNET_LE flag	2014-12-09 12:05:30 +02:00
if_tunnel.h	gue: TX support for using remote checksum offload option	2014-11-05 16:30:03 -05:00
if_vlan.h
if_x25.h
if.h
igmp.h
in6.h	net: reallocate new socket option number for IPV6_AUTOFLOWLABEL	2014-08-06 15:25:01 -07:00
in_route.h
in.h
inet_diag.h	net: tcp: add DCTCP congestion control algorithm	2014-09-29 00:13:10 -04:00
inotify.h
input.h	HID: add keyboard input assist hid usages	2014-10-20 21:03:58 +02:00
ioctl.h
ip6_tunnel.h
ip_vs.h	ipvs: Add destination address family to netlink interface	2014-09-16 09:03:33 +09:00
ip.h
ipc.h
ipmi_msgdefs.h
ipmi.h
ipsec.h
ipv6_route.h
ipv6.h	net: ipv6: Add a sysctl to make optimistic addresses useful candidates	2014-10-29 15:11:36 -04:00
ipx.h
irda.h
irqnr.h
isdn_divertif.h
isdn_ppp.h
isdn.h
isdnif.h
iso_fs.h
ivtv.h
ivtvfb.h
ixjuser.h
jffs2.h
joystick.h
Kbuild	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-12-11 14:27:06 -08:00
kd.h
kdev_t.h
kernel-page-flags.h	mm/balloon_compaction: add vmstat counters and kpageflags bit	2014-10-09 22:26:01 -04:00
kernel.h
kernelcapi.h
kexec.h	kexec: implementation of new syscall kexec_file_load	2014-08-08 15:57:32 -07:00
keyboard.h
keyctl.h
kvm_para.h	MIPS: Add functions for hypervisor call	2014-05-30 21:01:11 +02:00
kvm.h	KVM: device: add simple registration mechanism for kvm_device_ops	2014-09-17 13:10:08 +02:00
l2tp.h	l2tp: Add support for zero IPv6 checksums	2014-05-23 16:28:53 -04:00
libc-compat.h	xattr: guard against simultaneous glibc header inclusion	2014-04-03 16:21:06 -07:00
limits.h
llc.h
loop.h
lp.h
magic.h
major.h
map_to_7segment.h
matroxfb.h
mdio.h
media-bus-format.h	[media] Move mediabus format definition to a more standard place	2014-11-14 17:47:47 -02:00
media.h
mei.h
memfd.h	shm: add memfd_create() syscall	2014-08-08 15:57:31 -07:00
mempolicy.h
meye.h
mic_common.h
mic_ioctl.h
mii.h
minix_fs.h
mman.h
mmtimer.h
module.h
mpls.h
mqueue.h
mroute6.h
mroute.h
msdos_fs.h
msg.h	ipc/msg: increase MSGMNI, remove scaling	2014-12-13 12:42:52 -08:00
mtio.h
n_r3964.h
nbd.h
ncp_fs.h
ncp_mount.h
ncp_no.h
ncp.h
neighbour.h	bridge: add API to notify bridge driver of learned FBD on offloaded device	2014-12-02 20:01:22 -08:00
net_dropmon.h
net_tstamp.h	net-timestamp: allow reading recv cmsg on errqueue with origin tstamp	2014-12-08 20:20:48 -05:00
net.h
netconf.h
netdevice.h	net: add name_assign_type netdev attribute	2014-07-15 16:12:01 -07:00
netfilter_arp.h
netfilter_bridge.h
netfilter_decnet.h
netfilter_ipv4.h
netfilter_ipv6.h
netfilter.h
netlink_diag.h
netlink.h
netrom.h
nfc.h	NFC: NCI: Fix max length of General Bytes in ATR_RES	2014-12-02 22:59:28 +01:00
nfs2.h
nfs3.h
nfs4_mount.h
nfs4.h
nfs_fs.h
nfs_idmap.h
nfs_mount.h
nfs.h
nfsacl.h
nl80211.h	cfg80211: clean up beacon loss CQM event	2014-11-26 20:56:42 +01:00
nubus.h
nvme.h	NVMe: Define Log Page constants	2014-06-13 10:53:49 -04:00
nvram.h
omap3isp.h
omapfb.h
oom.h
openvswitch.h	openvswitch: Add support for OVS_FLOW_ATTR_PROBE.	2014-11-09 18:58:44 -08:00
packet_diag.h
param.h
parport.h
patchkey.h
pci_regs.h	Merge branches 'pci/aer' and 'pci/virtualization' into next	2014-10-01 12:30:58 -06:00
pci.h
perf_event.h	perf: Add ability to sample machine state on interrupt	2014-11-16 11:41:57 +01:00
personality.h
pfkeyv2.h
pg.h
phantom.h
phonet.h
pkt_cls.h
pkt_sched.h
pktcdvd.h
pmu.h
poll.h
posix_types.h
ppdev.h
ppp_defs.h
ppp-comp.h
ppp-ioctl.h
pps.h
prctl.h	x86, mpx: On-demand kernel allocation of bounds tables	2014-11-18 00:58:53 +01:00
psci.h	ARM/ARM64: KVM: Add common header for PSCI related defines	2014-04-30 04:18:57 -07:00
ptp_clock.h
ptrace.h
qnx4_fs.h
qnxtypes.h
quota.h
radeonfb.h
random.h	random: introduce getrandom(2) system call	2014-08-05 16:41:22 -04:00
raw.h
rds.h
reboot.h
reiserfs_fs.h
reiserfs_xattr.h
resource.h
rfkill.h
romfs_fs.h
rose.h
route.h
rtc.h
rtnetlink.h	rtnetlink: add babel protocol recognition	2014-11-10 12:05:59 -05:00
scc.h
sched.h	sched: Update comments about CLONE_NEWUTS and CLONE_NEWIPC	2014-11-16 10:58:53 +01:00
screen_info.h
sctp.h	net: sctp: implement rfc6458, 8.1.31. SCTP_DEFAULT_SNDINFO support	2014-07-16 14:40:04 -07:00
sdla.h
seccomp.h	seccomp: implement SECCOMP_FILTER_FLAG_TSYNC	2014-07-18 12:13:40 -07:00
securebits.h
selinux_netlink.h
sem.h	ipc/sem.c: increase SEMMSL, SEMMNI, SEMOPM	2014-12-13 12:42:52 -08:00
serial_core.h	ARM: meson: serial: add MesonX SoC on-chip uart driver	2014-09-08 16:12:40 -07:00
serial_reg.h	serial/uart/8250: Add tunable RX interrupt trigger I/F of FIFO buffers	2014-07-17 18:23:35 -07:00
serial.h
serio.h	Input: add support for Wacom protocol 4 serial tablets	2014-07-20 14:33:23 -07:00
shm.h	ipc,shm: document new limits in the uapi header	2014-06-06 16:08:14 -07:00
signal.h
signalfd.h
smiapp.h	[media] smiapp: Add driver-specific test pattern menu item definitions	2014-08-21 15:25:11 -05:00
snmp.h	tcp_cubic: add SNMP counters to track how effective is Hystart	2014-12-09 14:58:23 -05:00
sock_diag.h
socket.h
sockios.h
som.h
sonet.h
sonypi.h
sound.h
soundcard.h
stat.h
stddef.h
string.h
suspend_ioctls.h
swab.h
synclink.h
sysctl.h	kernel: add panic_on_warn	2014-12-10 17:41:10 -08:00
sysinfo.h
target_core_user.h	target: Add a user-passthrough backstore	2014-10-03 11:15:20 -07:00
taskstats.h
tcp_metrics.h
tcp.h
telephony.h
termios.h
time.h
times.h
timex.h
tiocl.h
tipc_config.h	tipc: bump max configurable window size	2014-06-25 18:03:41 -07:00
tipc_netlink.h	tipc: add name table dump to new netlink api	2014-11-21 15:01:32 -05:00
tipc.h	tipc: add ioctl to fetch link names	2014-04-26 12:13:24 -04:00
toshiba.h
tty_flags.h
tty.h
types.h
udf_fs_i.h
udp.h	net: Make enabling of zero UDP6 csums more restrictive	2014-05-23 16:28:53 -04:00
uhid.h	HID: uhid: report to user-space whether reports are numbered	2014-08-25 03:28:08 -05:00
uinput.h	Input: uinput - add UI_GET_VERSION ioctl	2014-07-21 14:30:42 -07:00
uio.h
ultrasound.h
un.h
unistd.h
unix_diag.h
usbdevice_fs.h
usbip.h	usbip: move usbip kernel code out of staging	2014-08-25 10:40:06 -07:00
utime.h
utsname.h
uuid.h
uvcvideo.h
v4l2-common.h	[media] v4l: Add V4L2_SEL_TGT_NATIVE_SIZE selection target	2014-12-04 12:37:01 -02:00
v4l2-controls.h	[media] v4l: Add camera pan/tilt speed controls	2014-09-21 20:23:39 -03:00
v4l2-dv-timings.h	Revert "[media] v4l2-dv-timings: fix a sparse warning"	2014-10-24 08:58:09 -02:00
v4l2-mediabus.h	[media] v4l2-mediabus: improve colorspace support	2014-12-01 15:34:55 -02:00
v4l2-subdev.h	[media] Make use of the new media_bus_format definitions	2014-11-14 17:51:18 -02:00
veth.h
vfio.h	vfio/iommu_type1: add new VFIO_TYPE1_NESTING_IOMMU IOMMU type	2014-09-29 10:06:19 -06:00
vhost.h
videodev2.h	[media] v4l: Add input and output capability flags for native size setting	2014-12-04 12:38:09 -02:00
virtio_9p.h
virtio_balloon.h
virtio_blk.h	virtio_blk: v1.0 support	2014-12-09 12:05:26 +02:00
virtio_config.h	virtio: make VIRTIO_F_VERSION_1 a transport bit	2014-12-09 12:06:32 +02:00
virtio_console.h	virtio_console: virtio 1.0 support	2014-12-09 12:06:32 +02:00
virtio_ids.h
virtio_net.h	virtio_net: v1.0 endianness	2014-12-09 12:05:26 +02:00
virtio_pci.h
virtio_ring.h	virtio: memory access APIs	2014-12-09 12:05:24 +02:00
virtio_rng.h
virtio_scsi.h	virtio_scsi: export to userspace	2014-12-09 12:06:31 +02:00
virtio_types.h	virtio: memory access APIs	2014-12-09 12:05:24 +02:00
vm_sockets.h
vsp1.h
vt.h
wait.h
wanrouter.h
watchdog.h
wil6210_uapi.h	wil6210: atomic I/O for the card memory	2014-10-02 14:23:14 -04:00
wimax.h
wireless.h
x25.h
xattr.h	xattr: fix check for simultaneous glibc header inclusion	2014-08-29 16:28:16 -07:00
xfrm.h	xfrm: configure policy hash table thresholds by netlink	2014-09-02 13:37:56 +02:00
zorro_ids.h
zorro.h