Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework

Dave asked me to do the backmerge before sending him the revised pull
request, so here we go. Nothing fancy in the conflicts, just a few
things changed right next to each another.

Conflicts:
	drivers/gpu/drm/drm_irq.c

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c
index 44b815e57f94..afd470e588ff 100644
--- a/fs/udf/unicode.c
+++ b/fs/udf/unicode.c
@@ -412,7 +412,6 @@ static int udf_translate_to_linux(uint8_t *newName, uint8_t *udfName,
         int extIndex = 0, newExtIndex = 0, hasExt = 0;
         unsigned short valueCRC;
         uint8_t curr;
-        const uint8_t hexChar[] = "0123456789ABCDEF";
 
         if (udfName[0] == '.' &&
             (udfLen == 1 || (udfLen == 2 && udfName[1] == '.'))) {
@@ -477,10 +476,10 @@ static int udf_translate_to_linux(uint8_t *newName, uint8_t *udfName,
                         newIndex = 250;
                 newName[newIndex++] = CRC_MARK;
                 valueCRC = crc_itu_t(0, fidName, fidNameLen);
-                newName[newIndex++] = hexChar[(valueCRC & 0xf000) >> 12];
-                newName[newIndex++] = hexChar[(valueCRC & 0x0f00) >> 8];
-                newName[newIndex++] = hexChar[(valueCRC & 0x00f0) >> 4];
-                newName[newIndex++] = hexChar[(valueCRC & 0x000f)];
+                newName[newIndex++] = hex_asc_upper_hi(valueCRC >> 8);
+                newName[newIndex++] = hex_asc_upper_lo(valueCRC >> 8);
+                newName[newIndex++] = hex_asc_upper_hi(valueCRC);
+                newName[newIndex++] = hex_asc_upper_lo(valueCRC);
 
                 if (hasExt) {
                         newName[newIndex++] = EXT_MARK;