The patch titled acpi: some random patch whcih apparently fixes something has been added to the -mm tree. Its filename is acpi-some-random-patch-whcih-apparently-fixes-something.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: acpi: some random patch whcih apparently fixes something From: Lin Ming <ming.m.lin@xxxxxxxxx> Sigh. Cc: Valdis Kletnieks <Valdis.Kletnieks@xxxxxx> Cc: Hugh Dickins <hugh.dickins@xxxxxxxxxxxxx> Cc: Len Brown <lenb@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/acpi/acpi_bus.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN include/acpi/acpi_bus.h~acpi-some-random-patch-whcih-apparently-fixes-something include/acpi/acpi_bus.h --- a/include/acpi/acpi_bus.h~acpi-some-random-patch-whcih-apparently-fixes-something +++ a/include/acpi/acpi_bus.h @@ -186,8 +186,8 @@ struct acpi_device_pnp { #define acpi_device_bid(d) ((d)->pnp.bus_id) #define acpi_device_adr(d) ((d)->pnp.bus_address) -#define acpi_device_hid(d) ((d)->pnp.hardware_id) -#define acpi_device_uid(d) ((d)->pnp.unique_id) +#define acpi_device_hid(d) ((d)->pnp.hardware_id ? (d)->pnp.hardware_id : "\0") +#define acpi_device_uid(d) ((d)->pnp.unique_id ? (d)->pnp.unique_id : "\0") #define acpi_device_name(d) ((d)->pnp.device_name) #define acpi_device_class(d) ((d)->pnp.device_class) _ Patches currently in -mm which might be from ming.m.lin@xxxxxxxxx are linux-next.patch acpi-some-random-patch-whcih-apparently-fixes-something.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html