Merge branch 'linus' into timers/urgent

Get upstream changes so we can apply fixes against them

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 6 insertions, 0 deletions

diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c
index e66d4d258e1a..bb5d115ca671 100644
--- a/scripts/mod/devicetable-offsets.c
+++ b/scripts/mod/devicetable-offsets.c
@@ -177,5 +177,11 @@ int main(void)
         DEVID(mei_cl_device_id);
         DEVID_FIELD(mei_cl_device_id, name);
 
+        DEVID(rio_device_id);
+        DEVID_FIELD(rio_device_id, did);
+        DEVID_FIELD(rio_device_id, vid);
+        DEVID_FIELD(rio_device_id, asm_did);
+        DEVID_FIELD(rio_device_id, asm_vid);
+
         return 0;
 }