Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b66696e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc 

* 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
  eeepc-wmi: include slab.h
  staging/otus: include slab.h from usbdrv.h
  percpu: don't implicitly include slab.h from percpu.h
  kmemcheck: Fix build errors due to missing slab.h
  include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
  iwlwifi: don't include iwl-dev.h from iwl-devtrace.h
  x86: don't include slab.h from arch/x86/include/asm/pgtable_32.h

Fix up trivial conflicts in include/linux/percpu.h due to
is_kernel_percpu_address() having been introduced since the slab.h
cleanup with the percpu_up.c splitup.
parents 9e74e7c8 a32f3926

Documentation/connector/cn_test.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/skbuff.h>

#include <linux/slab.h>

#include <linux/timer.h>



#include <linux/connector.h>

arch/alpha/boot/bootp.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * based significantly on the arch/alpha/boot/main.c of Linus Torvalds

 */

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <generated/utsrelease.h>

#include <linux/mm.h>

arch/alpha/boot/bootpz.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * and the decompression code from MILO.

 */

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <generated/utsrelease.h>

#include <linux/mm.h>

arch/alpha/boot/main.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * This file is the bootloader for the Linux/AXP kernel

 */

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <generated/utsrelease.h>

#include <linux/mm.h>

arch/alpha/boot/misc.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 */



#include <linux/kernel.h>

#include <linux/slab.h>



#include <asm/uaccess.h>