History

Merge tag 'v3.18-rc7' into drm-next

This fixes a bunch of conflicts prior to merging i915 tree. Linux 3.18-rc7

Dave Airlie committed 11 years ago

Commit e8115e72 parents 9be23ae 009d043590 files · +5467 −2560Browse files

Showing the changes to include/uapi/linux (2 of 590 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
@@ -125,6 +125,7 @@ header-y += filter.h · 124 unmodified lines
125header-y += firewire-cdev.h125header-y += firewire-cdev.h
126header-y += firewire-constants.h126header-y += firewire-constants.h
127header-y += flat.h127header-y += flat.h
128header-y += fou.h
128header-y += fs.h129header-y += fs.h
129header-y += fsl_hypervisor.h130header-y += fsl_hypervisor.h
130header-y += fuse.h131header-y += fuse.h
@@ -141,6 +142,7 @@ header-y += hid.h · 10 unmodified lines
141header-y += hiddev.h142header-y += hiddev.h
142header-y += hidraw.h143header-y += hidraw.h
143header-y += hpet.h144header-y += hpet.h
145header-y += hsr_netlink.h
144header-y += hyperv.h146header-y += hyperv.h
145header-y += hysdn_if.h147header-y += hysdn_if.h
146header-y += i2c-dev.h148header-y += i2c-dev.h
@@ -251,6 +253,7 @@ header-y += mii.h · 104 unmodified lines
251header-y += minix_fs.h253header-y += minix_fs.h
252header-y += mman.h254header-y += mman.h
253header-y += mmtimer.h255header-y += mmtimer.h
256header-y += mpls.h
254header-y += mqueue.h257header-y += mqueue.h
255header-y += mroute.h258header-y += mroute.h
256header-y += mroute6.h259header-y += mroute6.h
@@ -424,6 +427,7 @@ header-y += virtio_net.h · 167 unmodified lines
424header-y += virtio_pci.h427header-y += virtio_pci.h
425header-y += virtio_ring.h428header-y += virtio_ring.h
426header-y += virtio_rng.h429header-y += virtio_rng.h
430header=y += vm_sockets.h
427header-y += vt.h431header-y += vt.h
428header-y += wait.h432header-y += wait.h
429header-y += wanrouter.h433header-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"