Skip to content
  • Linus Torvalds's avatar
    Merge git://git.infradead.org/~dwmw2/khdrs-2.6 · 398477d4
    Linus Torvalds authored
    * git://git.infradead.org/~dwmw2/khdrs-2.6:
      New 'make headers_install_all' target.
      Use dependencies for 'make headers_install'.
      [S390] Unexport <asm/z90crypt.h>, export <asm/zcrypt.h> in its place.
      Remove dead netfilter_logging.h from include/linux/Kbuild
      Remove offsetof() from user-visible <linux/stddef.h>
      Clean up exported headers on CRIS
      Fix v850 exported headers
      Don't advertise (or allow) headers_{install,check} where inappropriate.
      Remove UML header export
      Remove ARM26 header export.
      Fix H8300 exported headers.
      Fix m68knommu exported headers
      Fix exported headers for SPARC, SPARC64
      Fix 'make headers_check' on m32r
      Fix 'make headers_check' on sh64
      Fix 'make headers_check' on sh
      [HEADERS] Fix ARM 'make headers_check'
    
    Initial pass of manual conflict resolution in top-level Makefile over
    conflicting build rule and headers_install changes.
    398477d4