Pull IPMI updates from Corey Minyard: "A small bug fix and a new driver for acting as an IPMI device. I was on vacation during the merge window (a long vacation) but this is a bug fix that should go in and a new driver that shouldn't hurt anything. This has been in linux-next for a month or so" * tag 'for-linus-4.9-2' of git://git.code.sf.net/p/openipmi/linux-ipmi: ipmi: fix crash on reading version from proc after unregisted bmc ipmi/bt-bmc: remove redundant return value check of platform_get_resource() ipmi/bt-bmc: add a dependency on ARCH_ASPEED ipmi: Fix ioremap error handling in bt-bmc ipmi: add an Aspeed BT IPMI BMC driver
Showing the changes to include/uapi/linux (2 of 9 files). Show all
Unified · Split
| @@ -75,6 +75,7 @@ header-y += bpf_perf_event.h · 74 unmodified lines | ||
| 75 | 75 | header-y += bpf.h |
| 76 | 76 | header-y += bpqether.h |
| 77 | 77 | header-y += bsg.h |
| 78 | +header-y += bt-bmc.h | |
| 78 | 79 | header-y += btrfs.h |
| 79 | 80 | header-y += can.h |
| 80 | 81 | header-y += capability.h |
| @@ -0,0 +1,18 @@ | ||
| 1 | +/* | |
| 2 | + * Copyright (c) 2015-2016, IBM Corporation. | |
| 3 | + * | |
| 4 | + * This program is free software; you can redistribute it and/or | |
| 5 | + * modify it under the terms of the GNU General Public License | |
| 6 | + * as published by the Free Software Foundation; either version | |
| 7 | + * 2 of the License, or (at your option) any later version. | |
| 8 | + */ | |
| 9 | + | |
| 10 | +#ifndef _UAPI_LINUX_BT_BMC_H | |
| 11 | +#define _UAPI_LINUX_BT_BMC_H | |
| 12 | + | |
| 13 | +#include <linux/ioctl.h> | |
| 14 | + | |
| 15 | +#define __BT_BMC_IOCTL_MAGIC 0xb1 | |
| 16 | +#define BT_BMC_IOCTL_SMS_ATN _IO(__BT_BMC_IOCTL_MAGIC, 0x00) | |
| 17 | + | |
| 18 | +#endif /* _UAPI_LINUX_BT_BMC_H */ | |