History

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
  1. include/uapi/linux/Kbuild +4 −0
  2. include/uapi/linux/if_bridge.h +1 −0
include/uapi/linux/Kbuild+4−0
@@ -126,6 +126,7 @@ header-y += filter.h · 125 unmodified lines
126header-y += firewire-cdev.h126header-y += firewire-cdev.h
127header-y += firewire-constants.h127header-y += firewire-constants.h
128header-y += flat.h128header-y += flat.h
129header-y += fou.h
129header-y += fs.h130header-y += fs.h
130header-y += fsl_hypervisor.h131header-y += fsl_hypervisor.h
131header-y += fuse.h132header-y += fuse.h
@@ -142,6 +143,7 @@ header-y += hid.h · 10 unmodified lines
142header-y += hiddev.h143header-y += hiddev.h
143header-y += hidraw.h144header-y += hidraw.h
144header-y += hpet.h145header-y += hpet.h
146header-y += hsr_netlink.h
145header-y += hyperv.h147header-y += hyperv.h
146header-y += hysdn_if.h148header-y += hysdn_if.h
147header-y += i2c-dev.h149header-y += i2c-dev.h
@@ -252,6 +254,7 @@ header-y += mii.h · 104 unmodified lines
252header-y += minix_fs.h254header-y += minix_fs.h
253header-y += mman.h255header-y += mman.h
254header-y += mmtimer.h256header-y += mmtimer.h
257header-y += mpls.h
255header-y += mqueue.h258header-y += mqueue.h
256header-y += mroute.h259header-y += mroute.h
257header-y += mroute6.h260header-y += mroute6.h
@@ -425,6 +428,7 @@ header-y += virtio_net.h · 167 unmodified lines
425header-y += virtio_pci.h428header-y += virtio_pci.h
426header-y += virtio_ring.h429header-y += virtio_ring.h
427header-y += virtio_rng.h430header-y += virtio_rng.h
431header=y += vm_sockets.h
428header-y += vt.h432header-y += vt.h
429header-y += wait.h433header-y += wait.h
430header-y += wanrouter.h434header-y += wanrouter.h
include/uapi/linux/if_bridge.h+1−0
@@ -15,6 +15,7 @@ · 14 unmodified lines
15 15
16#include <linux/types.h>16#include <linux/types.h>
17#include <linux/if_ether.h>17#include <linux/if_ether.h>
18#include <linux/in6.h>
18 19
19#define SYSFS_BRIDGE_ATTR "bridge"20#define SYSFS_BRIDGE_ATTR "bridge"
20#define SYSFS_BRIDGE_FDB "brforward"21#define SYSFS_BRIDGE_FDB "brforward"