diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-29 23:57:51 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-29 23:57:51 +0200 |
| commit | 3431e490b50356b56084305a2e93b3a980802b22 (patch) | |
| tree | da5213c3c05df56711a097c95e8a1410a46df78d /include/uapi/linux | |
| parent | 5af310a8ee70dd6a588c8ee1d4487a230a7b7b65 (diff) | |
| parent | 1dcc3d3362b0c97e48290f7786be85b4cec2a147 (diff) | |
Merge branch 'acpi-scan' into acpi-pm
Conflicts:
drivers/acpi/scan.c
The conflict is resolved by moving the just introduced
acpi_device_is_first_physical_node() to bus.c and using
the existing acpi_companion_match() from there.
There will be an additional commit to combine the two.
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/netconf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/netconf.h b/include/uapi/linux/netconf.h index 669a1f0b1d97..23cbd34e4ac7 100644 --- a/include/uapi/linux/netconf.h +++ b/include/uapi/linux/netconf.h @@ -15,6 +15,7 @@ enum { NETCONFA_RP_FILTER, NETCONFA_MC_FORWARDING, NETCONFA_PROXY_NEIGH, + NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN, __NETCONFA_MAX }; #define NETCONFA_MAX (__NETCONFA_MAX - 1) |