Commit Graph

320 Commits

Author SHA1 Message Date
Kyle McMartin
cbb00197b6 Merge branch 'master' into kernel-git 2010-12-09 13:51:51 -05:00
Kyle McMartin
72b3729657 Revert "Merge branch 'kernel-git' strategy 'theirs'"
This reverts commit a3f45c4a9c, reversing
changes made to ee99a68c51.
2010-12-09 13:46:11 -05:00
Kyle McMartin
7387649564 fix merge remnants 2010-12-09 13:40:55 -05:00
Kyle McMartin
a3f45c4a9c Merge branch 'kernel-git' strategy 'theirs'
Conflicts:
	xhci_hcd-suspend-resume.patch
2010-12-09 13:29:24 -05:00
Kyle McMartin
ee99a68c51 update to stable 2.6.36.2-rc1 2010-12-08 18:21:02 -05:00
Kyle McMartin
fc2adbbad5 ameliorate the load average account issues with dynticks (rhbz#650934) 2010-12-08 17:14:54 -05:00
Kyle McMartin
98e6119f39 Linux 2.6.37-rc5-git2 2010-12-08 16:23:18 -05:00
Kyle McMartin
abce2aa994 Linux 2.6.37-rc5 2010-12-07 21:29:28 -05:00
Kyle McMartin
f6c1ae10e3 fix thinko in previous commit, resulting in /usr/src/kernels/$ver/build/ 2010-12-06 12:51:18 -05:00
Kyle McMartin
817eb060de fix thinko in previous commit, resulting in /usr/src/kernels/$ver/build/ 2010-12-06 12:49:34 -05:00
Kyle McMartin
4b3b40727e don't prune kernel-devel in the %with_headers install section
commit c1bdfc8b broke the build on s390 since it is headers only,
and had nothing installed in /usr/src/kernels... since kernel-devel
is only produced when there's a BuildKernel, just prune '*.cmd'
when doing BuildKernel for the same net result.
2010-12-06 12:04:28 -05:00
Kyle McMartin
214d0ae2ff don't prune kernel-devel in the %with_headers install section
commit c1bdfc8b broke the build on s390 since it is headers only,
and had nothing installed in /usr/src/kernels... since kernel-devel
is only produced when there's a BuildKernel, just prune '*.cmd'
when doing BuildKernel for the same net result.
2010-12-06 10:41:38 -05:00
Kyle McMartin
a67a18274b enable cplus_demangle in perf 2010-12-04 12:17:29 -05:00
Kyle McMartin
8002c02cae enable cplus_demangle in perf 2010-12-04 11:36:16 -05:00
Kyle McMartin
5acda93677 Linux 2.6.37-rc4-git3 2010-12-03 07:26:49 -05:00
Kyle McMartin
aa56924465 enable hpilo.ko on x86_64 2010-12-03 07:09:39 -05:00
Kyle McMartin
254585788f kswapd fixes from mmotm
(queuing them here since it's unclear if they'll go into .37 or wait for
 .38)
2010-12-02 11:57:44 -05:00
Kyle McMartin
fe72140793 kswapd fixes from mmotm 2010-12-02 10:29:34 -05:00
Kyle McMartin
8077b629b4 suck in edp-fixes too 2010-12-01 15:05:40 -05:00
Kyle McMartin
f1aeb30fcc add on drm-fixes until they're queued 2010-12-01 10:27:16 -05:00
Kyle McMartin
5256969a14 Linux 2.6.37-rc4-git1 2010-12-01 10:12:17 -05:00
Kyle McMartin
1c8b1fa25a walters noticed i missed removing it from the manifest 2010-11-30 18:38:47 -05:00
Kyle McMartin
1a48cbfeed Linux 2.6.37-rc4 2010-11-30 11:30:30 -05:00
Kyle McMartin
4d70d8dc24 update debug-vm-would-have-oomkilled 2010-11-29 21:10:59 -05:00
Kyle McMartin
311bf8c0a9 un-rebase drm-intel-big-hammer & make-lvds-work, update would_have_oomkilled 2010-11-29 21:07:53 -05:00
Kyle McMartin
ed1195f0f7 add a patch to log pnp resources 2010-11-29 20:14:17 -05:00
Kyle McMartin
8c2ac42a63 bump baserelease to 2.6.36.1-10 2010-11-29 09:21:37 -05:00
Kyle McMartin
769514dd99 tty fixes from git and tpm fix from f14 2010-11-29 09:19:24 -05:00
Kyle McMartin
67f5884c55 Linux 2.6.37-rc3-git6 2010-11-29 08:32:10 -05:00
Kyle McMartin
dadc63b854 more patches for this tty open race 2010-11-27 10:30:59 -05:00
Kyle McMartin
ea17f5cd11 Linux 2.6.37-rc3-git3 2010-11-26 23:57:56 -05:00
Kyle McMartin
e31d248b5c copy tty debugging from rawhide 2010-11-26 17:05:38 -05:00
Kyle McMartin
25202fe3cf quiet a build warning the previous INET_DIAG change caused 2010-11-26 15:21:31 -05:00
Kyle McMartin
9a17bea44f plug various tty/serial stack leaks 2010-11-26 14:48:47 -05:00
Kyle McMartin
e7fe04dcca hda/realtek: handle unset external amp bits 2010-11-26 11:46:23 -05:00
Kyle McMartin
2f05b4a2c9 Linux 2.6.37-rc3-git2 2010-11-26 10:15:29 -05:00
Kyle McMartin
c3e06ee55a Linux 2.6.37-rc3-git2 2010-11-26 09:15:31 -05:00
kyle
1fbeac414b i loathe building debuginfo locally 2010-11-25 11:35:15 -05:00
kyle
e0db5a7a29 oops, it's ->ops->name 2010-11-25 11:34:29 -05:00
Kyle McMartin
275037eacd and your little ldisc too 2010-11-25 10:02:26 -05:00
Kyle McMartin
a92338bddd disable fscache for cifs (#656498) 2010-11-24 16:34:04 -05:00
Kyle McMartin
a0dc92f110 Linux 2.6.37-rc3-git1 2010-11-24 15:07:35 -05:00
Kyle McMartin
1f26442712 drm/radeon/kms: MC vram map needs to be >= pci aperture size (fdo#28402) 2010-11-24 14:13:32 -05:00
Kyle McMartin
f43af41c5a __func -> __func__ 2010-11-24 11:47:22 -05:00
Kyle McMartin
28f88fd957 fix graphics on hp 2530p which were broken due to pci crs fixes from upstream (korg#23542) 2010-11-24 06:54:32 -05:00
Kyle McMartin
18241e1172 posix-cpu-timers: workaround to suppress the problems with mt exec (rhbz#656264) 2010-11-23 11:42:09 -05:00
Kyle McMartin
ab76abd31e fix logic error in INET_DIAG bytecode auditing (CVE-2010-3880) 2010-11-23 11:08:44 -05:00
Kyle McMartin
205e1d9754 zero struct memory in ipc shm (CVE-2010-4072) 2010-11-23 10:55:43 -05:00
Kyle McMartin
79bb6459c7 initialize struct memory to zero in ipc compat (CVE-2010-4073) 2010-11-23 10:06:02 -05:00
Kyle McMartin
6b5e37dd4b fix i8k inline asm to avoid miscompilation with newer gcc 2010-11-23 09:50:52 -05:00