Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
06991c28f3
linux/arch/x86/um
History
Linus Torvalds 06991c28f3 Driver core patches for 3.9-rc1 
Here is the big driver core merge for 3.9-rc1
 
 There are two major series here, both of which touch lots of drivers all
 over the kernel, and will cause you some merge conflicts:
   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.
   - remove CONFIG_EXPERIMENTAL
 
 If you need me to provide a merged tree to handle these resolutions,
 please let me know.
 
 Other than those patches, there's not much here, some minor fixes and
 updates.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iEYEABECAAYFAlEmV0cACgkQMUfUDdst+yncCQCfbmnQZju7kzWXk6PjdFuKspT9
 weAAoMCzcAtEzzc4LXuUxxG/sXBVBCjW
 =yWAQ
 -----END PGP SIGNATURE-----

Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core patches from Greg Kroah-Hartman:
 "Here is the big driver core merge for 3.9-rc1

  There are two major series here, both of which touch lots of drivers
  all over the kernel, and will cause you some merge conflicts:

   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.

   - remove CONFIG_EXPERIMENTAL

  Other than those patches, there's not much here, some minor fixes and
  updates"

Fix up trivial conflicts

* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
  base: memory: fix soft/hard_offline_page permissions
  drivercore: Fix ordering between deferred_probe and exiting initcalls
  backlight: fix class_find_device() arguments
  TTY: mark tty_get_device call with the proper const values
  driver-core: constify data for class_find_device()
  firmware: Ignore abort check when no user-helper is used
  firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
  firmware: Make user-mode helper optional
  firmware: Refactoring for splitting user-mode helper code
  Driver core: treat unregistered bus_types as having no devices
  watchdog: Convert to devm_ioremap_resource()
  thermal: Convert to devm_ioremap_resource()
  spi: Convert to devm_ioremap_resource()
  power: Convert to devm_ioremap_resource()
  mtd: Convert to devm_ioremap_resource()
  mmc: Convert to devm_ioremap_resource()
  mfd: Convert to devm_ioremap_resource()
  media: Convert to devm_ioremap_resource()
  iommu: Convert to devm_ioremap_resource()
  drm: Convert to devm_ioremap_resource()
  ...
2013-02-21 12:05:51 -08:00
..
asm missing user_stack_pointer() instances 2012-12-19 18:07:39 -05:00
os-Linux um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
shared/sysdep take sys_fork/sys_vfork/sys_clone prototypes to linux/syscalls.h 2012-11-28 23:43:27 -05:00
vdso coredump: remove VM_ALWAYSDUMP flag 2012-03-23 16:58:42 -07:00
bug.c
bugs_32.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
bugs_64.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
checksum_32.S x86, extable: Remove open-coded exception table entries in arch/x86/um/checksum_32.S 2012-04-20 13:51:39 -07:00
delay.c um: merge delay_{32,64}.c 2011-11-02 14:15:37 +01:00
elfcore.c
fault.c um: don't compare a pointer to 0 2012-12-20 11:49:39 -08:00
Kconfig arch/x86/um: remove depends on CONFIG_EXPERIMENTAL 2013-01-11 11:38:05 -08:00
ksyms.c
ldt.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
Makefile x86, um: Use the same style generated syscall tables as native 2011-12-05 16:08:49 -08:00
mem_32.c coredump: remove VM_ALWAYSDUMP flag 2012-03-23 16:58:42 -07:00
mem_64.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
ptrace_32.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
ptrace_64.c um: unify ptrace_user.h 2011-11-02 14:15:27 +01:00
ptrace_user.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
setjmp_32.S
setjmp_64.S
signal.c new helpers: __save_altstack/__compat_save_altstack, switch x86 and um to those 2012-12-19 18:07:41 -05:00
stub_32.S um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
stub_64.S um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
stub_segv.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
sys_call_table_32.c introduce generic sys_sigaltstack(), switch x86 and um to it 2012-12-19 18:07:40 -05:00
sys_call_table_64.c introduce generic sys_sigaltstack(), switch x86 and um to it 2012-12-19 18:07:40 -05:00
syscalls_32.c x86, um: switch to generic fork/vfork/clone 2012-11-28 22:13:44 -05:00
syscalls_64.c um: kill thread->forking 2012-09-27 18:04:55 +02:00
sysrq_32.c um: move sysrq.h out of include/shared 2012-10-09 22:28:19 +02:00
sysrq_64.c um: move sysrq.h out of include/shared 2012-10-09 22:28:19 +02:00
tls_32.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
tls_64.c um: get rid of pointless include "..." where include <...> will do 2012-10-09 22:28:45 +02:00
user-offsets.c x32: Add x32 system calls to syscall/syscall_64.tbl 2012-02-20 12:48:49 -08:00