Merge 3.18-rc7 into staging-work.

We want those staging fixes in here as well.

Greg Kroah-Hartman committed 11 years ago

Commit deef2a12 parents aa9d9be 009d043592 files · +5504 −2580Browse files

Showing the changes to include/uapi/linux (2 of 592 files). Show all

Unified · Split

2 files

@@ -126,6 +126,7 @@ header-y += filter.h · 125 unmodified lines
126	126	header-y += firewire-cdev.h
127	127	header-y += firewire-constants.h
128	128	header-y += flat.h
	129	+header-y += fou.h
129	130	header-y += fs.h
130	131	header-y += fsl_hypervisor.h
131	132	header-y += fuse.h
@@ -142,6 +143,7 @@ header-y += hid.h · 10 unmodified lines
142	143	header-y += hiddev.h
143	144	header-y += hidraw.h
144	145	header-y += hpet.h
	146	+header-y += hsr_netlink.h
145	147	header-y += hyperv.h
146	148	header-y += hysdn_if.h
147	149	header-y += i2c-dev.h
@@ -252,6 +254,7 @@ header-y += mii.h · 104 unmodified lines
252	254	header-y += minix_fs.h
253	255	header-y += mman.h
254	256	header-y += mmtimer.h
	257	+header-y += mpls.h
255	258	header-y += mqueue.h
256	259	header-y += mroute.h
257	260	header-y += mroute6.h
@@ -425,6 +428,7 @@ header-y += virtio_net.h · 167 unmodified lines
425	428	header-y += virtio_pci.h
426	429	header-y += virtio_ring.h
427	430	header-y += virtio_rng.h
	431	+header=y += vm_sockets.h
428	432	header-y += vt.h
429	433	header-y += wait.h
430	434	header-y += wanrouter.h

@@ -15,6 +15,7 @@ · 14 unmodified lines
15	15
16	16	#include <linux/types.h>
17	17	#include <linux/if_ether.h>
	18	+#include <linux/in6.h>
18	19
19	20	#define SYSFS_BRIDGE_ATTR "bridge"
20	21	#define SYSFS_BRIDGE_FDB "brforward"