From: Linus Torvalds Date: Mon, 4 Dec 2006 16:29:45 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 X-Git-Tag: firefly_0821_release~30985^2~47^2~116 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=07704eb29a765d2e862000d952fd96271c1464e2;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git390.osdl.marist.edu/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (34 commits) [S390] Don't use small stacks when lockdep is used. [S390] cio: Use device_reprobe() instead of bus_rescan_devices(). [S390] cio: Retry internal operations after vary off. [S390] cio: Use path verification for last path gone after vary off. [S390] non-unique constant/macro identifiers. [S390] Memory detection fixes. [S390] cio: Make ccw_dev_id_is_equal() more robust. [S390] Convert extmem spin_lock into a mutex. [S390] set KBUILD_IMAGE. [S390] lockdep: show held locks when showing a stackdump [S390] Add dynamic size check for usercopy functions. [S390] Use diag260 for memory size detection. [S390] pfault code cleanup. [S390] Cleanup memory_chunk array usage. [S390] Misaligned wait PSW at memory detection. [S390] cpu shutdown rework [S390] cpcmd <-> __cpcmd calling issues [S390] Bad kexec control page allocation. [S390] Reset infrastructure for re-IPL. [S390] Some documentation typos. ... --- 07704eb29a765d2e862000d952fd96271c1464e2