Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 30945669
    Linus Torvalds authored
    Pull fixup for trivial branch from Jiri Kosina:
     "Unfortunately I made a mistake when merging into for-linus branch, and
      omitted one pre-requisity patch for a few other patches (which have
      been Acked by the appropriate maintainers) in the series.  Mea culpa
      maxima, sorry for that."
    
    The trivial branch added %pSR usage before actually teaching vsnprintf()
    about the 'R' part of %pSR.  The 'R' causes the symbol translation to do
    a "__builtin_extract_return_addr()" before symbol lookup.
    
    That said, on most architectures __builtin_extract_return_addr() isn't
    likely to do anything special, so it probably is not normally
    noticeable.
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
      vsprintf: Add extension %pSR - print_symbol replacement
    30945669