diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2021-02-06 01:33:49 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2021-02-06 01:33:49 +0200 |
| commit | 4d2544c30eab39bfe0eed6027fe4059f58ee91ad (patch) | |
| tree | cdb839bc415cbac2a2342c8f82ffe963e40faa48 /include/uapi/linux | |
| parent | 141849eac5defb4bb6cf6e6f1381cb24ffcfdba5 (diff) | |
| parent | c3cd6d0f0f73c7f0b0b5173ac7ad6753fb3b8ce1 (diff) | |
Merge tag 'LA.UM.9.2.r1-02000-SDMxx0.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4 into lineage-18.1-caf-msm8998
* tag 'LA.UM.9.2.r1-02000-SDMxx0.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4:
net: ipv6: Use passed in table for nexthop lookups
ipv6: addrconf: use stable address generator for ARPHRD_NONE
msm: kgsl: Protect the memdesc->gpuaddr in SVM use cases
msm: kgsl: Stop using memdesc->usermem
msm: kgsl: Correct the refcount on current process PID
HID: sony: Update hid_have_special_driver
UPSTREAM: HID: input: map digitizer battery usage
HID: input: ignore the battery in OKLICK Laser BTmouse
defconfig: Enable CONFIG_HID_NINTENDO for msm8998
iio: qcom-rradc: Update logic to monitor health of RRADC peripheral
qcom: fg-memif: Correct timeout condition for memory grant
power: qpnp-fg-gen3: Add a property to reset FG BCL device
msm: ipa3: Add check to validate rule_cnt
power_supply: add FG_RESET_CLOCK property
defconfig: Enable CONFIG_HID_NINTENDO for SDM660
FROMLIST: HID: nintendo: add nintendo switch controller driver
defconfig: Enable UTS_NS for sdm660
Conflicts:
drivers/hid/hid-input.c
drivers/power/power_supply_sysfs.c
include/linux/power_supply.h
Change-Id: I577e4b1d9410887224dbdb192c6eea1f2de6aded
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/if_link.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index 5ad57375a99f..7eb9178e3666 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -218,6 +218,7 @@ enum in6_addr_gen_mode { IN6_ADDR_GEN_MODE_EUI64, IN6_ADDR_GEN_MODE_NONE, IN6_ADDR_GEN_MODE_STABLE_PRIVACY, + IN6_ADDR_GEN_MODE_RANDOM, }; /* Bridge section */ |