History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts: include/net/inetpeer.h net/ipv6/output_core.c Changes in net were fixing bugs in code removed in net-next.

David S. Miller committed 12 years ago

Commit c99f7ab2 parents 92ff71b d8b0426181 files · +1656 −925Browse files

Showing the changes to include/uapi/linux (3 of 181 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/audit.h +1 −1
  2. include/uapi/linux/usb/Kbuild +1 −0
  3. include/uapi/linux/usb/cdc-wdm.h +2 −0
include/uapi/linux/audit.h+1−1
@@ -357,7 +357,7 @@ enum { · 356 unmodified lines
357#define AUDIT_ARCH_MIPS64N32 (EM_MIPS|__AUDIT_ARCH_64BIT|\357#define AUDIT_ARCH_MIPS64N32 (EM_MIPS|__AUDIT_ARCH_64BIT|\
358 __AUDIT_ARCH_CONVENTION_MIPS64_N32)358 __AUDIT_ARCH_CONVENTION_MIPS64_N32)
359#define AUDIT_ARCH_MIPSEL64 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)359#define AUDIT_ARCH_MIPSEL64 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
360#define AUDIT_ARCH_MIPSEL64N32 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE\360#define AUDIT_ARCH_MIPSEL64N32 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE|\
361 __AUDIT_ARCH_CONVENTION_MIPS64_N32)361 __AUDIT_ARCH_CONVENTION_MIPS64_N32)
362#define AUDIT_ARCH_OPENRISC (EM_OPENRISC)362#define AUDIT_ARCH_OPENRISC (EM_OPENRISC)
363#define AUDIT_ARCH_PARISC (EM_PARISC)363#define AUDIT_ARCH_PARISC (EM_PARISC)
include/uapi/linux/usb/Kbuild+1−0
@@ -1,6 +1,7 @@
1# UAPI Header export list1# UAPI Header export list
2header-y += audio.h2header-y += audio.h
3header-y += cdc.h3header-y += cdc.h
4header-y += cdc-wdm.h
4header-y += ch11.h5header-y += ch11.h
5header-y += ch9.h6header-y += ch9.h
6header-y += functionfs.h7header-y += functionfs.h
include/uapi/linux/usb/cdc-wdm.h+2−0
@@ -9,6 +9,8 @@ · 8 unmodified lines
9#ifndef _UAPI__LINUX_USB_CDC_WDM_H9#ifndef _UAPI__LINUX_USB_CDC_WDM_H
10#define _UAPI__LINUX_USB_CDC_WDM_H10#define _UAPI__LINUX_USB_CDC_WDM_H
11 11
12#include <linux/types.h>
13
12/*14/*
13 * This IOCTL is used to retrieve the wMaxCommand for the device,15 * This IOCTL is used to retrieve the wMaxCommand for the device,
14 * defining the message limit for both reading and writing.16 * defining the message limit for both reading and writing.