linux.git/drivers, branch v3.1-rc1

sh: Fix boot crash related to SCI

2011-08-07T22:51:45+00:00

Commit d006199e72a9 ("serial: sh-sci: Regtype probing doesn't need to be
fatal.") made sci_init_single() return when sci_probe_regmap() succeeds,
although it should return when sci_probe_regmap() fails.  This causes
systems using the serial sh-sci driver to crash during boot.

Fix the problem by using the right return condition.

Signed-off-by: Rafael J. Wysocki 
Signed-off-by: Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-08-07T05:12:37+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net: Compute protocol sequence numbers and fragment IDs using MD5.
  crypto: Move md5_transform to lib/md5.c

net: Compute protocol sequence numbers and fragment IDs using MD5.

2011-08-07T01:33:19+00:00

Computers have become a lot faster since we compromised on the
partial MD4 hash which we use currently for performance reasons.

MD5 is a much safer choice, and is inline with both RFC1948 and
other ISS generators (OpenBSD, Solaris, etc.)

Furthermore, only having 24-bits of the sequence number be truly
unpredictable is a very serious limitation.  So the periodic
regeneration and 8-bit counter have been removed.  We compute and
use a full 32-bit sequence number.

For ipv6, DCCP was found to use a 32-bit truncated initial sequence
number (it needs 43-bits) and that is fixed here as well.

Reported-by: Dan Kaminsky 
Tested-by: Willy Tarreau 
Signed-off-by: David S. Miller

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

2011-08-06T20:26:37+00:00

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM / Runtime: Allow _put_sync() from interrupts-disabled context
  PM / Domains: Fix pm_genpd_poweron()

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86

2011-08-06T20:26:15+00:00

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (38 commits)
  acer-wmi: support Lenovo ideapad S205 wifi switch
  acerhdf.c: spaces in aliased changed to *
  platform-drivers-x86: ideapad-laptop: add missing ideapad_input_exit in ideapad_acpi_add error path
  x86 driver: fix typo in TDP override enabling
  Platform: fix samsung-laptop DMI identification for N150/N210/220/N230
  dell-wmi: Add keys for Dell XPS L502X
  platform-drivers-x86: samsung-q10: make dmi_check_callback return 1
  Platform: Samsung Q10 backlight driver
  platform-drivers-x86: intel_scu_ipc: convert to DEFINE_PCI_DEVICE_TABLE
  platform-drivers-x86: intel_rar_register: convert to DEFINE_PCI_DEVICE_TABLE
  platform-drivers-x86: intel_menlow: add missing return AE_OK for intel_menlow_register_sensor()
  platform-drivers-x86: intel_mid_thermal: fix memory leak
  platform-drivers-x86: msi-wmi: add missing sparse_keymap_free in msi_wmi_init error path
  Samsung Laptop platform driver: support N510
  asus-wmi: add uwb rfkill support
  asus-wmi: add gps rfkill support
  asus-wmi: add CWAP support and clarify the meaning of WAPF bits
  asus-wmi: return proper value in store_cpufv()
  asus-wmi: check for temp1 presence
  asus-wmi: add thermal sensor
  ...

Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2011-08-06T19:22:30+00:00

* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/trace: Fix compile error when CONFIG_XEN_PRIVILEGED_GUEST is not set
  xen: Fix misleading WARN message at xen_release_chunk
  xen: Fix printk() format in xen/setup.c
  xen/tracing: it looks like we wanted CONFIG_FTRACE
  xen/self-balloon: Add dependency on tmem.
  xen/balloon: Fix compile errors - missing header files.
  xen/grant: Fix compile warning.
  xen/pciback: remove duplicated #include

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2011-08-06T19:21:19+00:00

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  Battery: sysfs_remove_battery(): possible circular locking

savagedb: Fix typo causing regression in savage4 series video chip detection

2011-08-06T19:02:40+00:00

Two additional savage4 variants were added, but the S3_SAVAGE4_SERIES
macro was incompletely modified, resulting in a false positive detection
of a savage4 card regardless of which savage card is actually present.

For non-savage4 series cards, such as a Savage/IX-MV card, this results
in garbled video and/or a hard-hang at boot time.  Fix this by changing
an '||' to an '&&' in the S3_SAVAGE4_SERIES macro.

Signed-off-by: John P. Stanley 
Reviewed-by: Tormod Volden 
[ The macros have incomplete parenthesis too, but whatever ..  -Linus ]
Signed-off-by: Linus Torvalds

Merge branch 'battery' into release

2011-08-06T02:16:42+00:00

Battery: sysfs_remove_battery(): possible circular locking

2011-08-06T02:15:18+00:00

Commit 9c921c22a7f33397a6774d7fa076db9b6a0fd669
Author: Lan Tianyu 

    ACPI / Battery: Resolve the race condition in the sysfs_remove_battery()

fixed BUG https://bugzilla.kernel.org/show_bug.cgi?id=35642 , but as a side
effect made lockdep unhappy with sysfs_remove_battery():

[14818.477168]
[14818.477170] =======================================================
[14818.477200] [ INFO: possible circular locking dependency detected ]
[14818.477221] 3.1.0-dbg-07865-g1280ea8-dirty #668
[14818.477236] -------------------------------------------------------
[14818.477257] s2ram/1599 is trying to acquire lock:
[14818.477276]  (s_active#8){++++.+}, at: [] sysfs_addrm_finish+0x31/0x5a
[14818.477323]
[14818.477325] but task is already holding lock:
[14818.477350]  (&battery->lock){+.+.+.}, at: [] sysfs_remove_battery+0x10/0x4b [battery]
[14818.477395]
[14818.477397] which lock already depends on the new lock.
[14818.477399]
[..]
[14818.479121] stack backtrace:
[14818.479148] Pid: 1599, comm: s2ram Not tainted 3.1.0-dbg-07865-g1280ea8-dirty #668
[14818.479175] Call Trace:
[14818.479198]  [] print_circular_bug+0x293/0x2a4
[14818.479228]  [] __lock_acquire+0xfe4/0x164b
[14818.479260]  [] ? sysfs_addrm_finish+0x31/0x5a
[14818.479288]  [] lock_acquire+0x138/0x1ac
[14818.479316]  [] ? sysfs_addrm_finish+0x31/0x5a
[14818.479345]  [] sysfs_deactivate+0x9b/0xec
[14818.479373]  [] ? sysfs_addrm_finish+0x31/0x5a
[14818.479405]  [] sysfs_addrm_finish+0x31/0x5a
[14818.479433]  [] sysfs_hash_and_remove+0x54/0x77
[14818.479461]  [] sysfs_remove_file+0x12/0x14
[14818.479488]  [] device_remove_file+0x12/0x14
[14818.479516]  [] device_del+0x119/0x17c
[14818.479542]  [] device_unregister+0xe/0x1a
[14818.479570]  [] power_supply_unregister+0x23/0x27
[14818.479601]  [] sysfs_remove_battery+0x34/0x4b [battery]
[14818.479632]  [] battery_notify+0x2c/0x3a [battery]
[14818.479662]  [] notifier_call_chain+0x74/0xa1
[14818.479692]  [] __blocking_notifier_call_chain+0x6c/0x89
[14818.479722]  [] blocking_notifier_call_chain+0xf/0x11
[14818.479751]  [] pm_notifier_call_chain+0x15/0x27
[14818.479770]  [] enter_state+0xa7/0xd5
[14818.479782]  [] state_store+0xaa/0xc0
[14818.479795]  [] ? pm_async_store+0x45/0x45
[14818.479807]  [] kobj_attr_store+0x17/0x19
[14818.479820]  [] sysfs_write_file+0x103/0x13f
[14818.479834]  [] vfs_write+0xad/0x13d
[14818.479847]  [] sys_write+0x45/0x6c
[14818.479860]  [] system_call_fastpath+0x16/0x1b

This patch introduces separate lock to struct acpi_battery to
grab in sysfs_remove_battery() instead of battery->lock.
So fix by Lan Tianyu is still there, we just grab independent lock.

Signed-off-by: Sergey Senozhatsky 
Tested-by: Lan Tianyu 
Signed-off-by: Len Brown