mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-16 17:23:55 +08:00
363e065c02
This fixes up a couple of conflicts when merging up with Linus' latest kernel. This will hopefully allow GFS2 to be more easily merged into forthcoming -mm and FC kernels due to the "one line per header" format now used for the kernel headers. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> Conflicts: include/linux/Kbuild include/linux/kernel.h |
||
---|---|---|
.. | ||
configfs_internal.h | ||
dir.c | ||
file.c | ||
inode.c | ||
item.c | ||
Makefile | ||
mount.c | ||
symlink.c |