Skip to content

L
linux
Commit 378a8995 authored by James Bottomley's avatar James Bottomley
Browse files
Options

Merge by hand

parents 9017032b 2e0376aa
Hide whitespace changes
Inline Side-by-side
Showing with 2672 additions and 2659 deletions
drivers/scsi/sg.c
View file @ 378a8995
This source diff could not be displayed because it is too large. You can view the blob instead.
include/scsi/sg.h
View file @ 378a8995
...@@ -11,9 +11,13 @@ Original driver (sg.h): ...@@ -11,9 +11,13 @@ Original driver (sg.h):
Version 2 and 3 extensions to driver: Version 2 and 3 extensions to driver:
* Copyright (C) 1998 - 2002 Douglas Gilbert * Copyright (C) 1998 - 2002 Douglas Gilbert
Version: 3.5.26 (20020708) Version: 3.5.27 (20020812)
This version is for 2.5 series kernels. This version is for 2.5 series kernels.
Changes since 3.5.26 (20020708)
- re-add direct IO using Kai Makisara's work
- re-tab to 8, start using C99-isms
- simplify memory management
Changes since 3.5.25 (20020504) Changes since 3.5.25 (20020504)
- driverfs additions - driverfs additions
- copy_to/from_user() fixes [William Stinson] - copy_to/from_user() fixes [William Stinson]
......
kernel/ksyms.c
View file @ 378a8995
...@@ -129,6 +129,7 @@ EXPORT_SYMBOL(highmem_start_page); ...@@ -129,6 +129,7 @@ EXPORT_SYMBOL(highmem_start_page);
EXPORT_SYMBOL(kmap_prot); EXPORT_SYMBOL(kmap_prot);
EXPORT_SYMBOL(kmap_pte); EXPORT_SYMBOL(kmap_pte);
#endif #endif
EXPORT_SYMBOL(get_user_pages);
/* filesystem internal functions */ /* filesystem internal functions */
EXPORT_SYMBOL(def_blk_fops); EXPORT_SYMBOL(def_blk_fops);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7