- Update to 2.6.27-rc9.
authorBernhard Walle <bwalle@suse.de>
Wed, 8 Oct 2008 12:19:10 +0000 (12:19 +0000)
committerBernhard Walle <bwalle@suse.de>
Wed, 8 Oct 2008 12:19:10 +0000 (12:19 +0000)
- Enable new configuration option CONFIG_MFD_SM501_GPIO.
- Drop following patches (mainline):
  o patches.suse/e1000e_debug_contention_on_NVM_SWFLAG
  o patches.suse/e1000e_do_not_ever_sleep_in_interrupt_context
  o patches.suse/e1000e_drop_stats_lock, e1000e_fix_lockdep_issues
  o patches.suse/e1000e_mmap_range_chk,
  o patches.suse/e1000e_reset_swflag_after_resetting_hardware
  o patches.suse/e1000e_update_versione1000e_write_protect_ichx_nvm
- Adjust/refresh following patches:
  o patches.arch/s390-01-03-cmm2-v2.patch
  o patches.drivers/e1000e_add_82574L.patch
  o patches.drivers/e1000e_add_ICH9_BM.patch
  o patches.drivers/e1000e_add_LOM_devices.patch
  o patches.suse/e1000e_allow_bad_checksum
  o patches.suse/e1000e_call_dump_eeprom
  o patches.suse/e1000e_ioremap_sanity_check
  o patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory

suse-commit: 8ac7b9310132e5c84426d94428bb5c0cb010daa7

17 files changed:
1  2 
Makefile
arch/ia64/kernel/head.S
arch/ia64/mm/discontig.c
arch/s390/kernel/time.c
arch/x86/kernel/acpi/boot.c
drivers/acpi/glue.c
drivers/md/dm-mpath.c
drivers/md/dm.c
drivers/net/e1000e/netdev.c
drivers/video/console/fbcon.c
drivers/video/console/fbcon.h
fs/inotify_user.c
init/main.c
kernel/hrtimer.c
kernel/sched.c
mm/page_alloc.c
scripts/mod/modpost.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
@@@ -132,6 -131,6 +132,9 @@@ static int s390_next_event(unsigned lon
  static void s390_set_mode(enum clock_event_mode mode,
                          struct clock_event_device *evt)
  {
++#ifdef CONFIG_PAGE_STATES
++      page_shrink_discard_list();
++#endif
  }
  
  /*
Simple merge
Simple merge
Simple merge
diff --cc drivers/md/dm.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc mm/page_alloc.c
Simple merge
Simple merge