diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2018-07-06 12:35:56 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2018-07-06 12:35:56 +0200 |
commit | 8f63e9230decb06ea9068feaf0845c0eb39ab890 (patch) | |
tree | a45cee821404ab0c7f7164e20c2f40f5e34ac16b /scripts/kconfig/expr.h | |
parent | 58ec5e9c9044bd7e1c0bcc6ad822b2e909f49732 (diff) | |
parent | 1268ed0c474a5c8f165ef386f3310521b5e00e27 (diff) |
Merge branch 'x86/urgent' into x86/hyperv
Integrate the upstream bug fix to resolve the resulting conflict in
__send_ipi_mask().
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'scripts/kconfig/expr.h')
-rw-r--r-- | scripts/kconfig/expr.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index 94a383b21df64..f63b41b0dd498 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h @@ -171,6 +171,9 @@ struct symbol { * config BAZ * int "BAZ Value" * range 1..255 + * + * Please, also check zconf.y:print_symbol() when modifying the + * list of property types! */ enum prop_type { P_UNKNOWN, |