Resolve cherry-picking conflicts:
Conflicts:
mm/huge_memory.c
mm/memory.c
mm/mprotect.c
See this upstream merge commit for more details:
|
||
|---|---|---|
| .. | ||
| configs | ||
| hpux | ||
| include | ||
| kernel | ||
| lib | ||
| math-emu | ||
| mm | ||
| oprofile | ||
| defpalo.conf | ||
| install.sh | ||
| Kconfig | ||
| Kconfig.debug | ||
| Makefile | ||
| nm | ||