Tue Jun 22 16:02:04 UTC 2010

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4152

Modified Files:
	.cvsignore Makefile config-arm config-debug config-generic 
	config-ia64-generic config-nodebug config-powerpc-generic 
	config-powerpc32-generic config-s390x config-sparc64-generic 
	config-x86-generic config-x86_64-generic hdpvr-ir-enable.patch 
	kernel.spec linux-2.6-defaults-pci_no_msi.patch 
	linux-2.6-execshield.patch lirc-2.6.33.patch sources 
Added Files:
	git-utrace.patch patch-2.6.35-rc3.bz2.sign 
	utrace-ptrace-fix-build.patch 
	utrace-remove-use-of-kref_set.patch 
Removed Files:
	add-appleir-usb-driver.patch 
	btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch 
	btrfs-should-add-permission-check-for-setfacl.patch 
	coredump-uid-pipe-check.patch 
	crypto-add-async-hash-testing.patch drm-next.patch 
	iwlwifi-Recover-TX-flow-failure.patch 
	iwlwifi-Recover-TX-flow-stall-due-to-stuck-queue.patch 
	iwlwifi-add-internal-short-scan-support-for-3945.patch 
	iwlwifi-code-cleanup-for-connectivity-recovery.patch 
	iwlwifi-fix-internal-scan-race.patch 
	iwlwifi-iwl_good_ack_health-only-apply-to-AGN-device.patch 
	iwlwifi-manage-QoS-by-mac-stack.patch 
	iwlwifi-move-plcp-check-to-separated-function.patch 
	iwlwifi-recalculate-average-tpt-if-not-current.patch 
	iwlwifi-recover_from_tx_stall.patch 
	linux-2.6-acpi-sleep-live-sci-live.patch 
	linux-2.6-acpi-video-export-edid.patch 
	linux-2.6-input-hid-quirk-egalax.patch 
	linux-2.6-tracehook.patch linux-2.6-umh-refactor.patch 
	linux-2.6-usb-wwan-update.patch linux-2.6-utrace-ptrace.patch 
	linux-2.6-utrace.patch linux-2.6-v4l-dvb-gspca-fixes.patch 
	linux-2.6-x86-cfi_sections.patch 
	mac80211-do-not-wipe-out-old-supported-rates.patch 
	mac80211-explicitly-disable-enable-QoS.patch 
	pci-hush-rom-warning.patch quiet-prove_RCU-in-cgroups.patch 
	thinkpad-acpi-add-x100e.patch virt_console-rollup.patch 
	virtqueue-wrappers.patch 
Log Message:
* Tue Jun 22 2010 Kyle McMartin <kyle at redhat.com> 2.6.35-0.1.rc3.git0
- Putting the raw back into rawhide... Yeehaw.
- 2.6.35-rc3
- Drop a tonne of patches that were merged upstream, or were backports.
- Rebase execshield, utrace.
- Fix up a bunch of rejects, build failures.
- Fix up lirc to build with strict copy_from_user checking.


git-utrace.patch:
 Documentation/DocBook/Makefile    |    2 
 Documentation/DocBook/utrace.tmpl |  590 +++++++++
 fs/proc/array.c                   |    3 
 include/linux/ptrace.h            |    3 
 include/linux/sched.h             |    6 
 include/linux/tracehook.h         |   97 +
 include/linux/utrace.h            |  692 ++++++++++
 init/Kconfig                      |    9 
 kernel/Makefile                   |    2 
 kernel/fork.c                     |    3 
 kernel/ptrace-utrace.c            | 1127 +++++++++++++++++
 kernel/ptrace.c                   |  620 ++++-----
 kernel/signal.c                   |    4 
 kernel/utrace.c                   | 2453 +++++++++++++++++++++++++++++++++++++-
 14 files changed, 5291 insertions(+), 320 deletions(-)

--- NEW FILE git-utrace.patch ---
>From c2f1645ae87d5b7fc5e5973c3a93a4ae1684a76b Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
Date: Tue, 22 Jun 2010 11:31:13 +0100
Subject: Merge remote branch 'utrace/utrace-ptrace' into rawhide

% git log --oneline --no-merges 7e27d6e..a91f6b7
f979955 utrace-ptrace: fix compiling ptrace_regset under CONFIG_UTRACE
b5f196b utrace-ptrace: copy PTRACE_GETREGSET code to utrace-ptrace
d83135e utrace: fix utrace_maybe_reap() vs find_matching_engine() race
9a2c607 utrace: move CONFIG_UTRACE after AUDITSYSCALL in init/Kconfig
62f4621 utrace: s/rmb/mb/ in tracehook_notify_resume()
65f5e9d utrace: fix utrace_maybe_reap logic
ed1f9c2 utrace: fix syntax nit for !CONFIG_UTRACE
71e3f39 ptrace: add utrace comment
e7afc73 utrace: use WARN with text
a8ced33 utrace: cosmetic restructure
4330b80 utrace: remove some inline keywords
d4be40a utrace: remove report_clone special priority for utrace_attach_task on child
8c56566 ptrace: updates for utrace API changes
1900135 utrace: streamline callback API
97662d3 utrace: more cosmetic trivia
fd414cd utrace: more cosmetic cleanup
f30f068 utrace: cosmetic trivia
cfebda7 utrace: fix the comments about rmb() in task_utrace_struct()
875858a utrace: improve the comment in tracehook_notify_resume()
76b49a5 utrace: fix the ->cloning check in utrace_attach_delay()
e0755bb utrace: kill mb() in tracehook_report_death()
9fdc988 fix __must_check warnings
3e02499 kill suppress_sigtrap()
f872e69 utrace: don't set ->ops = utrace_detached_ops lockless
938482e utrace: fix doc typo
7fae049 utrace: avoid BUG_ON when engine leaves bogus si_signo
71b7a85 utrace: trivial, move CONFIG_UTRACE into "General setup"
9c8dbe0 utrace: reset report action for UTRACE_SYSCALL_RESUMED iteration
4c7514e join PTRACE_EVENT_SYSCALL_XXX states
a8f782e export __ptrace_detach() and do_notify_parent_cldstop()
c3473e1 ptrace_signal: check PT_PTRACED before reporting a signal
b396f5e tracehooks: check PT_PTRACED before reporting the single-step
45667dd tracehooks: kill some PT_PTRACED checks
e8a2f23 ptrace: cleanup ptrace_init_task()->ptrace_link() path
611dab8 kill CONFIG_UTRACE_PTRACE
8d3833e rm kernel/ptrace-common.h
494deb7 export __ptrace_detach(), add "ifndef CONFIG_UTRACE" into ptrace.c
05cb325 (upstream) reorder the code in kernel/ptrace.c
eb10f13 restore the old kernel/ptrace.c
ddcc525 utrace_resume: Avoid finish_resume_report() for UTRACE_RESUME
47852f9 mv kernel/ptrace.c kernel/ptrace-utrace.c
de5a46e utrace: fix UTRACE_SYSCALL_RESUMED nits
3bd4be9 stepping, accommodate to utrace-cleanup changes
679be9e Revert "utrace: synthesize SIGTRAP for single-stepping at syscall-exit"
23ab966 utrace: barrier nits
d3800b8 utrace: tracehook_init_task
64daf14 utrace: task_utrace_struct() barrier
f19442c utrace: synthesize SIGTRAP for single-stepping at syscall-exit
2583b32 utrace: nit for utrace-ptrace
a88b467 ptrace: x86: change syscall_trace_leave() to rely on tracehook when stepping
e01acf4 ptrace: x86: implement user_single_step_siginfo()
462a57b ptrace: change tracehook_report_syscall_exit() to handle stepping
172590d ptrace: powerpc: implement user_single_step_siginfo()
d63b43d ptrace: introduce user_single_step_siginfo() helper
c575558 utrace: barriers for initializing struct utrace
89df3c7 utrace: utrace_attach_task() forgets to return when ->utrace == NULL
4d17e95 utrace: finish_report() must never set ->resume = UTRACE_STOP
212f67e utrace: utrace_get_signal() must check ->pending_attach
eff6ca8 change ptrace_report_signal() to use user_single_step_siginfo()
cba1272 don't send the unnecessary SIGTRAP after SYSCALL_EXIT
8aa71a6 revert "turn PTRACE_EVENT_SIGTRAP into PTRACE_EVENT_SIGNAL"
90c8237 utrace-ptrace: minimally handle UTRACE_SYSCALL_RESUMED
a7e9198 utrace: clean up resume-action handling
962eb2f utrace: update after merge
e2ced71 re-introduce utrace_finish_stop() to fix the race with SIGKILL
603e19c turn PTRACE_EVENT_SIGTRAP into PTRACE_EVENT_SIGNAL
ff87f65 introduce suppress_sigtrap() to prevent unwanted send_sigtrap()
6505e3c move ptrace_resume()->send_sigtrap() logic into ptrace_report_signal()
5261baa prepare ptrace_report_signal() to synthesize SIGTRAP
ef9534b ptrace_request: turn ptrace_resume() into default case
f50c776 s/context/ctx/
228b2e3 ptrace_notify_stop: kill the temporary WARN_ON()
93e866a ptrace_request(PTRACE_KILL) should not(?) return -ESRCH
26fefca utrace: sticky resume action
28b2774b utrace: remove ->stopped field
9e0f357 utrace_set_events: nit clean up
6d0bad3 nits
48bab07 (utrace) utrace_get_signal: don't dequeue_signal() if ->group_stop_count
d4ef551 (upstream) signals: check ->group_stop_count after tracehook_get_signal()
6292daa ptrace_detach_task: don't use valid_signal()
c5a6a82 cosmetic, renames
e422a3f cosmetic, relocate some code in ptrace.c
b96e4db (upstream) introduce kernel/ptrace.h
7665564 (upstream) tracehook_signal_handler: check PT_PTRACED
7d708ca tracehooks: revert utrace-ptrace changes
4104e29 (upstream) ptrace_init_task: cleanup the usage of ptrace_link()
d04ccb7 revert all utrace-ptrace changes in ptrace.h
80786ce revert utrace-ptrace changes in kernel/signal.c
0b02f9e introduce PT_UTRACED to replace PT_PTRACED inside ptrace.c
030ce35 tracehooks: remove some PT_PTRACED checks
4b7b15a revert the clone() related changes in tracehook.h
769030e hack ptrace_check_attach() to make it almost correct
7aa5c3a cosmetic, fold do_ptrace_resume() into ptrace_resume()
d27ebc1 cosmetic, introduce ptrace_resume_action()
35fbca4 turn context->sysemu into PTRACE_O_SYSEMU
38a8c1f PTRACE_SYSEMU_SINGLESTEP support
4367836 PTRACE_SYSEMU support
16819db ptrace_report_clone: minor cleanups + comments
ac1afd8 ptrace_resume: rewrite request processing
6b0d4f6 do_ptrace_resume: always use ptrace_wake_up()
fa92ce3 do_ptrace_resume: consolidate multiple switch stmts
135d780 uglify the code again to report VFORK_DONE after VFORK
4e3f362 fix PTRACE_SYSCALL after PTRACE_EVENT_VFORK_DONE stop
3f95189 ptrace_report_clone: uglify even more to handle TRACEVFORKDONE without TRACEVFORK
66ca8b6 ptrace_report_clone: uglify CLONE_PTRACE/CLONE_UNTRACED behaviour to match upstream
fc82b2c pretend PTRACE_O_TRACEVFORKDONE doesn't exist
28aa15a utrace_set_events: never return -EINPROGRESS unless clearing some event bits
a7f4350 utrace_stop: do ptrace_notify_stop() unconditionally
cb78492 ptrace_report_exit: fix WARN_ON() condition
bb941c3 do_ptrace_notify_stop: document the usage of tracee->exit_code
383ba85 ptrace_wake_up: don't clear tracee->exit_code + update comments
3d5c221 ptrace_wake_up: add "bool force_wakeup" argument for implicit detach
be6862e ptrace_wake_up: clear context->stop_code
bfb40c8 detach: use ptrace_wake_up() instead of utrace_control()
7de148a shift context re-initialization from detach to reuse
464def3 cleanup/optimize reuse/attch in ptrace_attach_task()
50f56b9 ptrace_attach_task: rely on utrace_barrier(), don't check ->ops
03376fd use set_stop_code() in ptrace_report_signal(UTRACE_SIGNAL_HANDLER)
85f8b3a detach should reset the context of self-detaching engine
a27233a attach: try to re-use the self-detaching engine
8667615 ptrace_notify_stop: fix engine leak
3d5d053 ptrace_detach_task: don't use engine ptr before IS_ERR(engine)
01875c7 fold detach_signal() into ptrace_detach_task()
464c2b7 don't detach the engine with the parting signal
97b345c implement the basic detach-with-signal logic
a158247 rework access to context->siginfo
20ea83b introduce set_stop_code() helper
eb222ed cosmetic, misc renames
f83b2ca move "event << 8" into syscall_code()
4c99287 kill context->ev_name
df7c8f2 encode internal stop events in ->ev_code too
3f48297 introduce get_stop_code(context) helper
313bad1 introduce syscall_code(context) helper
47b5e2c don't clear context->ev_code for debugging
4e09fe3 convert ptrace_setsiginfo() to use ptrace_rw_siginfo()
53187be convert ptrace_getsiginfo() to use ptrace_rw_siginfo()
e7ac055 introduce ptrace_rw_siginfo() helper
c625793 move "resume signal" logic into the tracee's context
0768d89 UTRACE_SIGNAL_HANDLER should never see ->siginfo != NULL
e90cb71 don't use task_struct->ptrace_message
842684f do_ptrace_notify_stop: fix the race with SIGKILL
d0ed18d do_ptrace_notify_stop: backport the "sync wakeup" logic
08f4a21 fix the stepping over syscall
a55d174 implement the stacked SYSCALL_EXIT event
ba73824 ptrace_resume: don't ignore "data" argument
fbd4368 kill context->ev_array[]
3c6f822 Revert "ptrace_resume_signal() should use context->siginfo under ->siglock"
ee31432 Revert "UTRACE_SIGNAL_HANDLER should never see ->siginfo != NULL"
a4e5af1 Revert "introduce context_siginfo() helper"
9bc939a revert merge w/s change
6752625 introduce context_siginfo() helper
d43a453 UTRACE_SIGNAL_HANDLER should never see ->siginfo != NULL
e4e48df ptrace_resume_signal() should use context->siginfo under ->siglock
4492770 implement UTRACE_SIGNAL_HANDLER stepping
5f926a5 implement PTRACE_SINGLESTEP/PTRACE_SINGLEBLOCK
8b70ae1 ptrace_request: use ptrace_lookup_engine()
abd580d change ptrace_resume() to have the single "return"
85878ae introduce ptrace_lookup_engine()
74904f1 mv task_struct->last_siginfo ptrace_context->siginfo
2b17f4a pretens ptrace_detach(sig) works
075db41 ptrace_report_quiesce() can't trust fatal_signal_pending()
d583c87 remove the now unneeded code
69a6c83 break ptrace_report_signal()
d6a31ee do_ptrace_notify_stop: kill "->ev_message != 0" check
e194687 convert ptrace_report_exit()
8bf8304 PTRACE_EVENT_VFORK_DONE: set ev_options = PTRACE_O_TRACEVFORKDONE
b8f5e2a make sure PTRACE_SYSCALL reports SYSCALL_EXIT
258b27d make sure PTRACE_CONT "disables" SYSCALL_EXIT report
d26b659 introduce ptrace_event->ev_options
03a0fe3 convert ptrace_report_exec()
bea6139 convert ptrace_report_syscall_entry()
17dd96d cleanup/simplify stop/resume mess
97fc962 utrace: comments
c661ddb utrace: move struct utrace back where it belongs
95dcdee implement stacked stop events
8608da6 ptrace_report_syscall_exit: do not WARN() if killed
95a6b6b ptrace_report_clone: rework the stop/resume logic
25dd723 remove the current PTRACE_EVENT_VFORK_DONE logic
7d8900a ptrace_wake_up: fix the "compatibility bug" logic
9a50d27 ptrace_report_syscall_exit: return UTRACE_STOP, not UTRACE_RESUME
c07370d simplify utrace_add_engine() vs utrace_reap() protection
0f4d918 utrace_add_engine: cleanup
a24e891 fix utrace_reset() vs release_task() theoretical race
dfc0917 change attach/release to avoid unnecessary utrace_reap()
cbed668 utrace_attach_task: do no check ->exit_state
9d114a6 utrace_wakeup: do not check target->state
9368f18 utrace_wakeup: lock ->siglock directly
e9b58e9 convert ptrace_report_syscall_exit() to use ptrace_context
1d47e4d introduce context->resume_stopped()
c34d813 introduce context->stopped_code
b7edb5e introduce ptrace_notify_stop()
93b2e7e utrace_release_task: cosmetic
ac6e19c utrace_reap: loop lockless, do not clear ->ops and ->flags early
[...5927 lines suppressed...]
+			siginitsetinv(&sigkill_only, sigmask(SIGKILL));
+			spin_lock_irq(&task->sighand->siglock);
+			signr = dequeue_signal(task, &sigkill_only, info);
+			BUG_ON(signr != SIGKILL);
+			*return_ka = task->sighand->action[SIGKILL - 1];
+			return signr;
+		}
+
+		if (unlikely(report.result & UTRACE_SIGNAL_HOLD)) {
+			push_back_signal(task, info);
+			spin_unlock_irq(&task->sighand->siglock);
+		}
+
+		return -1;
+	}
+
+	/*
+	 * Complete the bookkeeping after the report.
+	 * This sets utrace->resume if UTRACE_STOP was used.
+	 */
+	finish_report(task, utrace, &report, true);
+
+	return_ka->sa.sa_handler = SIG_DFL;
+
+	/*
+	 * If this signal is fatal, si_signo gets through as exit_code.
+	 * We can't allow a completely bogus value there or else core
+	 * kernel code can freak out.  (If an engine wants to control
+	 * the exit_code value exactly, it can do so in report_exit.)
+	 * We'll produce a big complaint in dmesg, but won't crash.
+	 * That's nicer for debugging your utrace engine.
+	 */
+	if (unlikely(info->si_signo & 0x80)) {
+		WARN(1, "utrace engine left bogus si_signo value!");
+		info->si_signo = SIGTRAP;
+	}
+
+	if (unlikely(report.result & UTRACE_SIGNAL_HOLD))
+		push_back_signal(task, info);
+	else
+		spin_lock_irq(&task->sighand->siglock);
+
+	if (sig_kernel_stop(signr))
+		task->signal->flags |= SIGNAL_STOP_DEQUEUED;
+
+	return signr;
+}
+
+/*
+ * This gets called after a signal handler has been set up.
+ * We set a flag so the next report knows it happened.
+ * If we're already stepping, make sure we do a report_signal.
+ * If not, make sure we get into utrace_resume() where we can
+ * clear the signal_handler flag before resuming.
+ */
+void utrace_signal_handler(struct task_struct *task, int stepping)
+{
+	struct utrace *utrace = task_utrace_struct(task);
+
+	spin_lock(&utrace->lock);
+
+	utrace->signal_handler = 1;
+	if (utrace->resume > UTRACE_INTERRUPT) {
+		if (stepping) {
+			utrace->resume = UTRACE_INTERRUPT;
+			set_tsk_thread_flag(task, TIF_SIGPENDING);
+		} else if (utrace->resume == UTRACE_RESUME) {
+			set_tsk_thread_flag(task, TIF_NOTIFY_RESUME);
+		}
+	}
+
+	spin_unlock(&utrace->lock);
+}
+
+/**
+ * utrace_prepare_examine - prepare to examine thread state
+ * @target:		thread of interest, a &struct task_struct pointer
+ * @engine:		engine pointer returned by utrace_attach_task()
+ * @exam:		temporary state, a &struct utrace_examiner pointer
+ *
+ * This call prepares to safely examine the thread @target using
+ * &struct user_regset calls, or direct access to thread-synchronous fields.
+ *
+ * When @target is current, this call is superfluous.  When @target is
+ * another thread, it must be held stopped via %UTRACE_STOP by @engine.
+ *
+ * This call may block the caller until @target stays stopped, so it must
+ * be called only after the caller is sure @target is about to unschedule.
+ * This means a zero return from a utrace_control() call on @engine giving
+ * %UTRACE_STOP, or a report_quiesce() or report_signal() callback to
+ * @engine that used %UTRACE_STOP in its return value.
+ *
+ * Returns -%ESRCH if @target is dead or -%EINVAL if %UTRACE_STOP was
+ * not used.  If @target has started running again despite %UTRACE_STOP
+ * (for %SIGKILL or a spurious wakeup), this call returns -%EAGAIN.
+ *
+ * When this call returns zero, it's safe to use &struct user_regset
+ * calls and task_user_regset_view() on @target and to examine some of
+ * its fields directly.  When the examination is complete, a
+ * utrace_finish_examine() call must follow to check whether it was
+ * completed safely.
+ */
+int utrace_prepare_examine(struct task_struct *target,
+			   struct utrace_engine *engine,
+			   struct utrace_examiner *exam)
+{
+	int ret = 0;
+
+	if (unlikely(target == current))
+		return 0;
+
+	rcu_read_lock();
+	if (unlikely(!engine_wants_stop(engine)))
+		ret = -EINVAL;
+	else if (unlikely(target->exit_state))
+		ret = -ESRCH;
+	else {
+		exam->state = target->state;
+		if (unlikely(exam->state == TASK_RUNNING))
+			ret = -EAGAIN;
+		else
+			get_task_struct(target);
+	}
+	rcu_read_unlock();
+
+	if (likely(!ret)) {
+		exam->ncsw = wait_task_inactive(target, exam->state);
+		put_task_struct(target);
+		if (unlikely(!exam->ncsw))
+			ret = -EAGAIN;
+	}
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(utrace_prepare_examine);
+
+/**
+ * utrace_finish_examine - complete an examination of thread state
+ * @target:		thread of interest, a &struct task_struct pointer
+ * @engine:		engine pointer returned by utrace_attach_task()
+ * @exam:		pointer passed to utrace_prepare_examine() call
+ *
+ * This call completes an examination on the thread @target begun by a
+ * paired utrace_prepare_examine() call with the same arguments that
+ * returned success (zero).
+ *
+ * When @target is current, this call is superfluous.  When @target is
+ * another thread, this returns zero if @target has remained unscheduled
+ * since the paired utrace_prepare_examine() call returned zero.
+ *
+ * When this returns an error, any examination done since the paired
+ * utrace_prepare_examine() call is unreliable and the data extracted
+ * should be discarded.  The error is -%EINVAL if @engine is not
+ * keeping @target stopped, or -%EAGAIN if @target woke up unexpectedly.
+ */
+int utrace_finish_examine(struct task_struct *target,
+			  struct utrace_engine *engine,
+			  struct utrace_examiner *exam)
+{
+	int ret = 0;
+
+	if (unlikely(target == current))
+		return 0;
+
+	rcu_read_lock();
+	if (unlikely(!engine_wants_stop(engine)))
+		ret = -EINVAL;
+	else if (unlikely(target->state != exam->state))
+		ret = -EAGAIN;
+	else
+		get_task_struct(target);
+	rcu_read_unlock();
+
+	if (likely(!ret)) {
+		unsigned long ncsw = wait_task_inactive(target, exam->state);
+		if (unlikely(ncsw != exam->ncsw))
+			ret = -EAGAIN;
+		put_task_struct(target);
+	}
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(utrace_finish_examine);
+
+/*
+ * This is declared in linux/regset.h and defined in machine-dependent
+ * code.  We put the export here to ensure no machine forgets it.
+ */
+EXPORT_SYMBOL_GPL(task_user_regset_view);
+
+/*
+ * Called with rcu_read_lock() held.
+ */
+void task_utrace_proc_status(struct seq_file *m, struct task_struct *p)
+{
+	seq_printf(m, "Utrace:\t%lx\n", p->utrace_flags);
+}
-- 
1.7.0.1



--- NEW FILE patch-2.6.35-rc3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBMEvJMyGugalF9Dw4RAsuRAJ9UsnqbCDCEjEtQSR823MRh/OoySgCbBN5W
lO0E42W3Q0PkDd3gmu0H2n0=
=xoqz
-----END PGP SIGNATURE-----

utrace-ptrace-fix-build.patch:
 ptrace-utrace.c |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE utrace-ptrace-fix-build.patch ---
>From 9b7ec0e07ce85c377b76626cef552d27d59cc405 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
Date: Tue, 22 Jun 2010 13:57:47 +0100
Subject: utrace-ptrace: removed defunct arch_ptrace_untrace call

commit faa4602e removed the unused BTS code which had added
this hook.

Signed-off-by: Kyle McMartin <kyle at redhat.com>
---
 kernel/ptrace-utrace.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/kernel/ptrace-utrace.c b/kernel/ptrace-utrace.c
index 86234ee..1a8ba5e 100644
--- a/kernel/ptrace-utrace.c
+++ b/kernel/ptrace-utrace.c
@@ -50,8 +50,6 @@ void __ptrace_unlink(struct task_struct *child)
 	child->ptrace = 0;
 	child->parent = child->real_parent;
 	list_del_init(&child->ptrace_entry);
-
-	arch_ptrace_untrace(child);
 }
 
 struct ptrace_context {
-- 
1.7.0.1


utrace-remove-use-of-kref_set.patch:
 utrace.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE utrace-remove-use-of-kref_set.patch ---
>From ad778e66100e4b76bab6b939e3d0c781da82d980 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
Date: Tue, 22 Jun 2010 14:09:30 +0100
Subject: utrace: remove use of kref_set

Unfortunatey db1afffa which removed kref_set did not anticipate
anyone would actually like to use a kref which starts with a refcnt
above 1. Replace kref_set in utrace with a kref_init + kref_get to
immediately bump the reference count.

Signed-off-by: Kyle McMartin <kyle at redhat.com>
---
 kernel/utrace.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kernel/utrace.c b/kernel/utrace.c
index f5a9e2c..cc864d5 100644
--- a/kernel/utrace.c
+++ b/kernel/utrace.c
@@ -304,7 +304,8 @@ struct utrace_engine *utrace_attach_task(
 	 * Initialize the new engine structure.  It starts out with two
 	 * refs: one ref to return, and one ref for being attached.
 	 */
-	kref_set(&engine->kref, 2);
+	kref_init(&engine->kref);
+	kref_get(&engine->kref);
 	engine->flags = 0;
 	engine->ops = ops;
 	engine->data = data;
-- 
1.7.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1197
retrieving revision 1.1198
diff -u -p -r1.1197 -r1.1198
--- .cvsignore	16 May 2010 22:08:59 -0000	1.1197
+++ .cvsignore	22 Jun 2010 16:01:41 -0000	1.1198
@@ -5,3 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.34
 linux-2.6.34.tar.bz2
+patch-2.6.35-rc3.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -r1.126 -r1.127
--- Makefile	21 Apr 2010 17:11:52 -0000	1.126
+++ Makefile	22 Jun 2010 16:01:42 -0000	1.127
@@ -99,6 +99,10 @@ debug:
 	@perl -pi -e 's/# CONFIG_DMADEVICES_VDEBUG is not set/CONFIG_DMADEVICES_VDEBUG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_CEPH_FS_PRETTYDEBUG is not set/CONFIG_CEPH_FS_PRETTYDEBUG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_QUOTA_DEBUG is not set/CONFIG_QUOTA_DEBUG=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_KGDB_KDB is not set/CONFIG_KGDB_KDB=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_KDB_KEYBOARD is not set/CONFIG_KDB_KEYBOARD=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set/CONFIG_CPU_NOTIFIER_ERROR_INJECT=m/' config-nodebug
+	@perl -pi -e 's/# CONFIG_DEBUG_PER_CPU_MAPS is not set/CONFIG_DEBUG_PER_CPU_MAPS=y/' config-nodebug
 
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -166,6 +170,10 @@ release:
 	@perl -pi -e 's/CONFIG_DMADEVICES_VDEBUG=y/# CONFIG_DMADEVICES_VDEBUG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_CEPH_FS_PRETTYDEBUG=y/# CONFIG_CEPH_FS_PRETTYDEBUG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_QUOTA_DEBUG=y/# CONFIG_QUOTA_DEBUG is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_CPU_NOTIFIER_ERROR_INJECT=m/# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set/' config-nodebug
+	#@perl -pi -e 's/CONFIG_KGDB_KDB=y/# CONFIG_KGDB_KDB is not set/' config-nodebug
+	#@perl -pi -e 's/CONFIG_KDB_KEYBOARD=y/# CONFIG_KDB_KEYBOARD is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_DEBUG_PER_CPU_MAPS=y/# CONFIG_DEBUG_PER_CPU_MAPS is not set/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug


Index: config-arm
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-arm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- config-arm	6 Mar 2010 20:41:30 -0000	1.8
+++ config-arm	22 Jun 2010 16:01:43 -0000	1.9
@@ -2,6 +2,8 @@ CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_SMP is not set
 
+# CONFIG_CMDLINE_FORCE is not set
+
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 
 CONFIG_ARCH_VERSATILE=y
@@ -108,3 +110,6 @@ CONFIG_RCU_FANOUT=32
 
 CONFIG_PERF_EVENTS=y
 CONFIG_PERF_COUNTERS=y
+
+# CONFIG_MG_DISK is not set
+# CONFIG_GPIO_PL061 is not set


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- config-debug	21 Apr 2010 17:11:52 -0000	1.42
+++ config-debug	22 Jun 2010 16:01:43 -0000	1.43
@@ -9,6 +9,11 @@ CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_VM=y
 CONFIG_DEBUG_SPINLOCK=y
 CONFIG_PROVE_RCU=y
+# CONFIG_PROVE_RCU_REPEATEDLY is not set
+CONFIG_DEBUG_PER_CPU_MAPS=y
+CONFIG_CPUMASK_OFFSTACK=y
+
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
 
 CONFIG_FAULT_INJECTION=y
 CONFIG_FAILSLAB=y
@@ -85,3 +90,6 @@ CONFIG_PM_ADVANCED_DEBUG=y
 
 CONFIG_CEPH_FS_PRETTYDEBUG=y
 CONFIG_QUOTA_DEBUG=y
+
+CONFIG_KGDB_KDB=y
+CONFIG_KDB_KEYBOARD=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -p -r1.369 -r1.370
--- config-generic	9 Jun 2010 19:59:34 -0000	1.369
+++ config-generic	22 Jun 2010 16:01:43 -0000	1.370
@@ -5,6 +5,7 @@ CONFIG_MMU=y
 CONFIG_SMP=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_LOCALVERSION=""
+CONFIG_CROSS_COMPILE=""
 
 #
 # Code maturity level options
@@ -148,10 +149,12 @@ CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_AMSO1100=m
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
 CONFIG_INFINIBAND_CXGB3=m
+CONFIG_INFINIBAND_CXGB4=m
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_INFINIBAND_NES=m
 # CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_QIB=m
 
 #
 # Executable file formats
@@ -201,6 +204,7 @@ CONFIG_NFTL_RW=y
 CONFIG_INFTL=m
 CONFIG_RFD_FTL=m
 CONFIG_SSFDC=m
+# CONFIG_SM_FTL is not set
 
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -239,6 +243,7 @@ CONFIG_MTD_SCB2_FLASH=m
 CONFIG_MTD_PCI=m
 CONFIG_MTD_TS5500=m
 # CONFIG_MTD_GPIO_ADDR is not set
+# CONFIG_MTD_PCMCIA is not set
 
 #
 # Self-contained MTD device drivers
@@ -274,6 +279,10 @@ CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND_CS553X=m
+# CONFIG_MTD_NAND_DENALI is not set
+CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
+# CONFIG_MTD_NAND_GPIO is not set
+CONFIG_MTD_NAND_RICOH=m
 
 CONFIG_MTD_REDBOOT_PARTS=m
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -543,6 +552,7 @@ CONFIG_VMWARE_PVSCSI=m
 CONFIG_VMWARE_BALLOON=m
 
 CONFIG_ATA=y
+CONFIG_ATA_BMDMA=y
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_ATA_SFF=y
 CONFIG_ATA_PIIX=y
@@ -550,6 +560,7 @@ CONFIG_ATA_ACPI=y
 CONFIG_BLK_DEV_SX8=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
@@ -765,6 +776,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
 CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_ARPD=y
@@ -815,6 +827,7 @@ CONFIG_IPV6_TUNNEL=m
 CONFIG_IPV6_SUBTREES=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IPV6_PIMSM_V2=y
 
 CONFIG_RDS=m
@@ -839,6 +852,8 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
@@ -852,6 +867,7 @@ CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
@@ -1005,6 +1021,7 @@ CONFIG_INET6_XFRM_MODE_BEET=m
 # SCTP Configuration (EXPERIMENTAL)
 #
 CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
@@ -1162,6 +1179,14 @@ CONFIG_ATM_NICSTAR=m
 # CONFIG_ATM_IA_DEBUG is not set
 CONFIG_ATM_SOLOS=m
 
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+
+# CONFIG_CAIF is not set
+
 CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=y
 
@@ -1389,6 +1414,8 @@ CONFIG_ATH5K_DEBUG=y
 CONFIG_ATH9K=m
 # CONFIG_ATH9K_DEBUG is not set
 CONFIG_ATH9K_DEBUGFS=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_AT76C50X_USB=m
 CONFIG_AIRO=m
 CONFIG_AIRO_CS=m
@@ -1396,11 +1423,11 @@ CONFIG_ATMEL=m
 CONFIG_B43=m
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
-# CONFIG_B43_DEBUG is not set
+CONFIG_B43_DEBUG=y
 CONFIG_B43_PHY_LP=y
 # CONFIG_B43_FORCE_PIO is not set
 CONFIG_B43LEGACY=m
-# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DEBUG=y
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -1408,6 +1435,12 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_PIO_MODE is not set
 CONFIG_HERMES=m
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
+# CONFIG_HERMES_PRISM is not set
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_ORINOCO_USB=m
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_PLX=m
@@ -1423,9 +1456,10 @@ CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_DEBUG=y
+# CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS_THINFIRM=m
 CONFIG_LIBERTAS_THINFIRM_USB=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
 CONFIG_LIBERTAS_MESH=y
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_DEBUG=y
@@ -1438,17 +1472,14 @@ CONFIG_IWL3945=m
 CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
 CONFIG_IWM=m
 # CONFIG_IWM_DEBUG is not set
+# CONFIG_IWM_TRACING is not set
 CONFIG_MAC80211_HWSIM=m
-CONFIG_NORTEL_HERMES=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
 CONFIG_P54_PCI=m
-CONFIG_PCI_HERMES=m
-CONFIG_PLX_HERMES=m
 CONFIG_PCI_ATMEL=m
 CONFIG_MWL8K=m
 # CONFIG_PRISM54 is not set
-CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
@@ -1594,6 +1625,7 @@ CONFIG_WINBOND_FIR=m
 #
 CONFIG_BT=m
 CONFIG_BT_L2CAP=m
+CONFIG_BT_L2CAP_EXT_FEATURES=y
 CONFIG_BT_SCO=m
 CONFIG_BT_CMTP=m
 CONFIG_BT_RFCOMM=m
@@ -1815,6 +1847,7 @@ CONFIG_QT2160=m
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_MAX7359=m
 CONFIG_KEYBOARD_OPENCORES=m
+# CONFIG_KEYBOARD_TCA6416 is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -1878,6 +1911,8 @@ CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_W90X900=m
 CONFIG_TOUCHSCREEN_MCS5000=m
+# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
+# CONFIG_TOUCHSCREEN_TPS6507X is not set
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
@@ -1895,6 +1930,9 @@ CONFIG_INPUT_WM831X_ON=m
 
 CONFIG_INPUT_APPLEIR=m
 
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_PCF8574 is not set
+
 #
 # Character devices
 #
@@ -1908,6 +1946,7 @@ CONFIG_SYNCLINK=m
 CONFIG_SYNCLINKMP=m
 CONFIG_SYNCLINK_GT=m
 CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
 # CONFIG_STALDRV is not set
 # CONFIG_IBM_ASM is not set
 CONFIG_TIFM_CORE=m
@@ -1947,6 +1986,9 @@ CONFIG_CYCLADES=m
 # CONFIG_ISTALLION is not set
 CONFIG_SERIAL_JSM=m
 
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+
 #
 # Non-8250 serial port support
 #
@@ -2109,6 +2151,8 @@ CONFIG_SENSORS_LM73=m
 CONFIG_SENSORS_AMC6821=m
 CONFIG_SENSORS_ADT7411=m
 CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_TMP102=m
 
 CONFIG_W1=m
 CONFIG_W1_CON=y
@@ -2534,6 +2578,17 @@ CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 
+CONFIG_RC_MAP=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_IMON=m
+
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
+
 #
 # Broadcom Crystal HD video decoder driver
 #
@@ -2612,6 +2667,7 @@ CONFIG_FB_VOODOO1=m
 # CONFIG_FB_VT8623 is not set
 CONFIG_FB_EFI=y
 CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
 CONFIG_FB_METRONOME=m
 CONFIG_FB_MB862XX=m
 CONFIG_FB_MB862XX_PCI_GDC=y
@@ -2722,6 +2778,7 @@ CONFIG_SND_ENS1370=m
 CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_CTXFI=m
@@ -2756,6 +2813,7 @@ CONFIG_SND_INTEL8X0=y
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
 CONFIG_SND_MIRO=m
 CONFIG_SND_MIXART=m
 CONFIG_SND_NM256=m
@@ -2776,6 +2834,7 @@ CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
+CONFIG_SND_ASIHPI=m
 
 #
 # ALSA USB devices
@@ -2875,7 +2934,8 @@ CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_PANTHERLORD_FF=y
 CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WACOM_POWER_SUPPLY=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_IDMOUSE=m
@@ -2889,6 +2949,28 @@ CONFIG_HID_MOSART=y
 CONFIG_HID_NTRIG=y
 CONFIG_HID_QUANTA=y
 CONFIG_HID_STANTUM=y
+CONFIG_HID_CANDO=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_HID_EGALAX=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_HID_ZYDACRON=m
+
 
 #
 # USB Imaging devices
@@ -3055,6 +3137,8 @@ CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+# CONFIG_USB_SERIAL_ZIO is not set
 CONFIG_USB_SERIAL_MOS7840=m
 CONFIG_USB_SERIAL_MOTOROLA=m
 CONFIG_USB_SERIAL_NAVMAN=m
@@ -3159,6 +3243,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_CHARGER_PCF50633=m
 CONFIG_RTC_DRV_PCF50633=m
 
+CONFIG_MFD_SUPPORT=y
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MFD_TC6393XB is not set
@@ -3173,6 +3258,12 @@ CONFIG_MFD_WM8400=m
 # CONFIG_LPC_SCH is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
 
 #
 # File systems
@@ -3294,6 +3385,7 @@ CONFIG_JFFS2_FS_POSIX_ACL=y
 CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTRS=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_VXFS_FS=m
 # CONFIG_HPFS_FS is not set
@@ -3473,6 +3565,7 @@ CONFIG_HEADERS_CHECK=y
 CONFIG_KGDB=y
 CONFIG_KGDB_SERIAL_CONSOLE=y
 CONFIG_KGDB_TESTS=y
+CONFIG_KGDB_LOW_LEVEL_TRAP=y
 # CONFIG_KGDB_TESTS_ON_BOOT is not set
 
 #
@@ -3586,6 +3679,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_PROGEAR=m
+# CONFIG_BACKLIGHT_ADP8860 is not set
 CONFIG_FB_NVIDIA_BACKLIGHT=y
 CONFIG_FB_RIVA_BACKLIGHT=y
 CONFIG_FB_RADEON_BACKLIGHT=y
@@ -3603,18 +3697,21 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 
 CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_FREEZER=y
-CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
 
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
@@ -3640,7 +3737,7 @@ CONFIG_IBMASR=m
 CONFIG_PM_DEBUG=y
 CONFIG_PM_TRACE=y
 # CONFIG_PM_VERBOSE is not set
-# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_TEST_SUSPEND=y
 CONFIG_PM_RUNTIME=y
 
 ## BEGIN ISA Junk.
@@ -3796,7 +3893,7 @@ CONFIG_SND_INDIGODJX=m
 
 ## END of ISA options.
 
-
+CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
@@ -3825,6 +3922,7 @@ CONFIG_LEDS_INTEL_SS4200=m
 
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
+# CONFIG_TIMB_DMA is not set
 CONFIG_NET_DMA=y
 # CONFIG_DMATEST is not set
 CONFIG_ASYNC_TX_DMA=y
@@ -3866,6 +3964,7 @@ CONFIG_CFAG12864B_RATE=20
 
 CONFIG_POWER_SUPPLY=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_TEST_POWER is not set
 CONFIG_APM_POWER=m
 CONFIG_WM831X_POWER=m
 # CONFIG_BATTERY_DS2760 is not set
@@ -4015,6 +4114,13 @@ CONFIG_STAGING=y
 # CONFIG_STAGING_EXCLUDE_BUILD is not set
 # CONFIG_ET131X is not set
 # CONFIG_SLICOSS is not set
+# CONFIG_VIDEO_TM6000 is not set
+# CONFIG_WLAGS49_H2 is not set
+# CONFIG_WLAGS49_H25 is not set
+# CONFIG_VIDEO_DT3155 is not set
+# CONFIG_TI_ST is not set
+# CONFIG_ST_BT is not set
+# CONFIG_FB_XGI is not set
 # CONFIG_VIDEO_GO7007 is not set
 # CONFIG_USB_IP_COMMON is not set
 # CONFIG_DT3155 is not set
@@ -4061,7 +4167,7 @@ CONFIG_USB_ATMEL=m
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
-# CONFIG_BOOT_TRACER is not set
+CONFIG_BOOT_TRACER=y
 CONFIG_EARLY_PRINTK_DBGP=y
 
 CONFIG_SECURITYFS=y
@@ -4142,6 +4248,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_ATOMIC64_SELFTEST=y
 
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
@@ -4166,8 +4273,13 @@ CONFIG_BLK_DEV_DRBD=m
 # CONFIG_UCB1400_CORE is not set
 # CONFIG_RADIO_MIROPCM20 is not set
 # CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_GPIO_SCH is not set
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_RDC321X is not set
 
 
 CONFIG_KSYM_TRACER=y
 CONFIG_PROFILE_KSYM_TRACER=y
 CONFIG_KPROBE_EVENT=y
+
+# CONFIG_RAMOOPS is not set


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- config-ia64-generic	24 Feb 2010 23:31:58 -0000	1.28
+++ config-ia64-generic	22 Jun 2010 16:01:44 -0000	1.29
@@ -138,6 +138,7 @@ CONFIG_ACPI_THERMAL=y
 # CONFIG_ACPI_TOSHIBA is not set
 CONFIG_ACPI_VIDEO=m
 # CONFIG_ACPI_PROC_EVENT is not set
+CONFIG_ACPI_HED=m
 
 CONFIG_PM=y
 CONFIG_HOTPLUG_PCI=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- config-nodebug	2 Jun 2010 12:03:11 -0000	1.57
+++ config-nodebug	22 Jun 2010 16:01:44 -0000	1.58
@@ -2,86 +2,94 @@ CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_PROVE_RCU is not set
-
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_FAILSLAB is not set
-# CONFIG_FAIL_PAGE_ALLOC is not set
-# CONFIG_FAIL_MAKE_REQUEST is not set
-# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
-# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
-# CONFIG_FAIL_IO_TIMEOUT is not set
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_DEBUG_LOCK_ALLOC=y
+CONFIG_PROVE_LOCKING=y
+CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_PROVE_RCU=y
+# CONFIG_PROVE_RCU_REPEATEDLY is not set
+CONFIG_DEBUG_PER_CPU_MAPS=y
+CONFIG_CPUMASK_OFFSTACK=y
+
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+
+CONFIG_FAULT_INJECTION=y
+CONFIG_FAILSLAB=y
+CONFIG_FAIL_PAGE_ALLOC=y
+CONFIG_FAIL_MAKE_REQUEST=y
+CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+CONFIG_FAIL_IO_TIMEOUT=y
 
-# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_DEBUG_ON=y
 
-# CONFIG_LOCK_STAT is not set
+CONFIG_LOCK_STAT=y
 
-# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_DEBUG_STACK_USAGE=y
 
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
 # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
 
-# CONFIG_DEBUG_SG is not set
+CONFIG_DEBUG_SG=y
 
 # CONFIG_DEBUG_PAGEALLOC is not set
 
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DEBUG_OBJECTS is not set
+CONFIG_DEBUG_WRITECOUNT=y
+CONFIG_DEBUG_OBJECTS=y
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
-# CONFIG_DEBUG_OBJECTS_FREE is not set
-# CONFIG_DEBUG_OBJECTS_TIMERS is not set
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 
-# CONFIG_X86_PTDUMP is not set
+CONFIG_X86_PTDUMP=y
 
-# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_CAN_DEBUG_DEVICES=y
 
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
 
-# CONFIG_DEBUG_NOTIFIERS is not set
+CONFIG_DEBUG_NOTIFIERS=y
 
-# CONFIG_DMA_API_DEBUG is not set
+CONFIG_DMA_API_DEBUG=y
 
-# CONFIG_MMIOTRACE is not set
+CONFIG_MMIOTRACE=y
 
-# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_DEBUG_CREDENTIALS=y
 
 # off in both production debug and nodebug builds,
 #  on in rawhide nodebug builds
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 
-# CONFIG_EXT4_DEBUG is not set
+CONFIG_EXT4_DEBUG=y
 
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_DEBUG_PERF_USE_VMALLOC=y
 
-# CONFIG_JBD2_DEBUG is not set
+CONFIG_JBD2_DEBUG=y
 
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_DYNAMIC_FTRACE is not set
+CONFIG_FUNCTION_TRACER=y
+CONFIG_STACK_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
 
-# CONFIG_DEBUG_CFQ_IOSCHED is not set
+CONFIG_DEBUG_CFQ_IOSCHED=y
 
-# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_DRBD_FAULT_INJECTION=y
 
-# CONFIG_ATH_DEBUG is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_ATH_DEBUG=y
+CONFIG_IWLWIFI_DEVICE_TRACING=y
 
-# CONFIG_DEBUG_OBJECTS_WORK is not set
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+CONFIG_DEBUG_OBJECTS_WORK=y
+CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y
 
-# CONFIG_DMADEVICES_DEBUG is not set
-# CONFIG_DMADEVICES_VDEBUG is not set
+CONFIG_DMADEVICES_DEBUG=y
+CONFIG_DMADEVICES_VDEBUG=y
 
 CONFIG_PM_ADVANCED_DEBUG=y
 
-# CONFIG_CEPH_FS_PRETTYDEBUG is not set
-# CONFIG_QUOTA_DEBUG is not set
+CONFIG_CEPH_FS_PRETTYDEBUG=y
+CONFIG_QUOTA_DEBUG=y
+
+CONFIG_KGDB_KDB=y
+CONFIG_KDB_KEYBOARD=y


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- config-powerpc-generic	8 Mar 2010 22:04:55 -0000	1.56
+++ config-powerpc-generic	22 Jun 2010 16:01:44 -0000	1.57
@@ -307,6 +307,7 @@ CONFIG_SWIOTLB=y
 
 CONFIG_PPC_DISABLE_WERROR=y
 
+CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_EMACLITE=m
 
 CONFIG_GPIO_WM831X=m
@@ -328,4 +329,6 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 # CONFIG_MMC_SDHCI_OF_ESDHC is not set
 # CONFIG_MMC_SDHCI_OF_HLWD is not set
 
+# CONFIG_MFD_TC35892 is not set
+
 # CONFIG_GPIO_SCH is not set


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc32-generic,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- config-powerpc32-generic	24 Feb 2010 23:31:58 -0000	1.38
+++ config-powerpc32-generic	22 Jun 2010 16:01:44 -0000	1.39
@@ -180,3 +180,4 @@ CONFIG_PERF_COUNTERS=y
 CONFIG_PERF_EVENTS=y
 CONFIG_EVENT_PROFILE=y
 
+CONFIG_KVM_BOOK3S_32=m


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- config-s390x	3 Jun 2010 23:07:03 -0000	1.24
+++ config-s390x	22 Jun 2010 16:01:45 -0000	1.25
@@ -163,8 +163,6 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
 
 # CONFIG_CLAW is not set
 
-CONFIG_VMCP=m
-
 # CONFIG_ATMEL is not set
 
 # CONFIG_CDROM_PKTCDVD is not set
@@ -226,3 +224,5 @@ CONFIG_EVENT_PROFILE=y
 CONFIG_SMSGIUCV_EVENT=m
 
 # CONFIG_PREEMPT_TRACER is not set
+
+CONFIG_VMCP=y


Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- config-sparc64-generic	22 Mar 2010 13:31:59 -0000	1.34
+++ config-sparc64-generic	22 Jun 2010 16:01:45 -0000	1.35
@@ -199,3 +199,5 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 
 CONFIG_GRETH=m
 CONFIG_FB_XVR1000=y
+
+CONFIG_CRYPTO_DEV_NIAGARA2=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- config-x86-generic	22 Jun 2010 01:28:10 -0000	1.101
+++ config-x86-generic	22 Jun 2010 16:01:45 -0000	1.102
@@ -148,11 +148,14 @@ CONFIG_ACPI_THERMAL=y
 CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_VIDEO=m
-# Disable in F9.
-CONFIG_ACPI_PROC_EVENT=y
+# CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_PNPACPI=y
 CONFIG_ACPI_POWER_METER=m
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=m
+# CONFIG_ACPI_APEI_EINJ is not set
 
 #
 # CPUFreq processor drivers
@@ -282,6 +285,7 @@ CONFIG_EDAC_I5400=m
 CONFIG_EDAC_R82600=m
 CONFIG_EDAC_AMD8131=m
 CONFIG_EDAC_AMD8111=m
+CONFIG_EDAC_I7CORE=m
 
 CONFIG_SCHED_MC=y
 
@@ -315,8 +319,11 @@ CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_TC1100_WMI=m
 CONFIG_HP_WMI=m
+# CONFIG_INTEL_SCU_IPC is not set
 CONFIG_DELL_WMI=m
 
+# CONFIG_TOUCHSCREEN_INTEL_MID is not set
+
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_W83697HF_WDT=m
 CONFIG_IB700_WDT=m
@@ -483,3 +490,7 @@ CONFIG_TOSHIBA_BT_RFKILL=m
 
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_LPC_SCH=m
+
+CONFIG_INTEL_IDLE=m
+
+CONFIG_PCI_CNB20LE_QUIRK=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- config-x86_64-generic	17 Jun 2010 09:52:11 -0000	1.109
+++ config-x86_64-generic	22 Jun 2010 16:01:45 -0000	1.110
@@ -15,7 +15,7 @@ CONFIG_NUMA=y
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NR_CPUS=256
+CONFIG_NR_CPUS=512
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_P4_CLOCKMOD=m
 CONFIG_IA32_EMULATION=y
@@ -90,10 +90,13 @@ CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_POWER=y
 CONFIG_ACPI_VIDEO=m
-# Disable in F9.
-CONFIG_ACPI_PROC_EVENT=y
+# CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_ACPI_POWER_METER=m
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=m
+# CONFIG_ACPI_APEI_EINJ is not set
 
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ASUS_LAPTOP=m
@@ -111,6 +114,9 @@ CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_HP_WMI=m
 CONFIG_DELL_WMI=m
+# CONFIG_INTEL_SCU_IPC is not set
+
+# CONFIG_TOUCHSCREEN_INTEL_MID is not set
 
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
@@ -199,6 +205,7 @@ CONFIG_EDAC_AMD8111=m
 CONFIG_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_DECODE_MCE=m
+CONFIG_EDAC_I7CORE=m
 
 CONFIG_SCHED_MC=y
 
@@ -395,3 +402,8 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_LPC_SCH=m
+
+CONFIG_INTEL_IDLE=m
+CONFIG_I7300_IDLE=m
+
+CONFIG_PCI_CNB20LE_QUIRK=y

hdpvr-ir-enable.patch:
 Makefile      |    4 --
 hdpvr-core.c  |    7 ++--
 hdpvr-i2c.c   |   83 ++++++++++++++++++++++++++++++++++++++++------------------
 hdpvr-video.c |    7 +---
 hdpvr.h       |    2 -
 5 files changed, 65 insertions(+), 38 deletions(-)

Index: hdpvr-ir-enable.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/hdpvr-ir-enable.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- hdpvr-ir-enable.patch	14 Jun 2010 09:44:06 -0000	1.8
+++ hdpvr-ir-enable.patch	22 Jun 2010 16:01:57 -0000	1.9
@@ -1,26 +1,20 @@
- drivers/media/video/hdpvr/Makefile     |    4 +-
- drivers/media/video/hdpvr/hdpvr-core.c |   12 ++---
- drivers/media/video/hdpvr/hdpvr-i2c.c  |   83 ++++++++++++++++++++++----------
- drivers/media/video/hdpvr/hdpvr.h      |    2 +-
- 4 files changed, 64 insertions(+), 37 deletions(-)
-
 diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile
-index e0230fc..a0b9a43 100644
+index e0230fc..3baa9f6 100644
 --- a/drivers/media/video/hdpvr/Makefile
 +++ b/drivers/media/video/hdpvr/Makefile
 @@ -1,6 +1,4 @@
 -hdpvr-objs	:= hdpvr-control.o hdpvr-core.o hdpvr-video.o
 -
 -hdpvr-$(CONFIG_I2C) += hdpvr-i2c.o
-+hdpvr-objs	:= hdpvr-control.o hdpvr-i2c.o hdpvr-core.o hdpvr-video.o
++hdpvr-objs	:= hdpvr-control.o hdpvr-core.o hdpvr-video.o hdpvr-i2c.o
  
  obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
  
 diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
-index 2fc9865..c72793a 100644
+index 830d47b..70cfdc8 100644
 --- a/drivers/media/video/hdpvr/hdpvr-core.c
 +++ b/drivers/media/video/hdpvr/hdpvr-core.c
-@@ -364,9 +364,8 @@ static int hdpvr_probe(struct usb_interface *interface,
+@@ -364,14 +364,13 @@ static int hdpvr_probe(struct usb_interface *interface,
  		goto error;
  	}
  
@@ -32,23 +26,14 @@ index 2fc9865..c72793a 100644
  	if (retval < 0) {
  		v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
  		goto error;
-@@ -412,12 +411,9 @@ static void hdpvr_disconnect(struct usb_interface *interface)
- 	mutex_unlock(&dev->io_mutex);
- 
- 	/* deregister I2C adapter */
--#ifdef CONFIG_I2C
-+#if defined(CONFIG_I2C) || (CONFIG_I2C_MODULE)
- 	mutex_lock(&dev->i2c_mutex);
--	if (dev->i2c_adapter)
--		i2c_del_adapter(dev->i2c_adapter);
--	kfree(dev->i2c_adapter);
--	dev->i2c_adapter = NULL;
-+	i2c_del_adapter(&dev->i2c_adapter);
- 	mutex_unlock(&dev->i2c_mutex);
- #endif /* CONFIG_I2C */
+ 	}
+-#endif /* CONFIG_I2C */
++#endif
  
+ 	/* let the user know what node this device is now attached to */
+ 	v4l2_info(&dev->v4l2_dev, "device now attached to %s\n",
 diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
-index 463b81b..a0557e4 100644
+index 463b81b..60cdc06 100644
 --- a/drivers/media/video/hdpvr/hdpvr-i2c.c
 +++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
 @@ -10,6 +10,8 @@
@@ -200,9 +185,28 @@ index 463b81b..a0557e4 100644
  	return retval;
  }
 +
-+#endif /* CONFIG_I2C */
++#endif
+diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
+index c338f3f..26fd9bf 100644
+--- a/drivers/media/video/hdpvr/hdpvr-video.c
++++ b/drivers/media/video/hdpvr/hdpvr-video.c
+@@ -1221,12 +1221,9 @@ static void hdpvr_device_release(struct video_device *vdev)
+ 	v4l2_device_unregister(&dev->v4l2_dev);
+ 
+ 	/* deregister I2C adapter */
+-#ifdef CONFIG_I2C
++#if defined(CONFIG_I2C) || (CONFIG_I2C_MODULE)
+ 	mutex_lock(&dev->i2c_mutex);
+-	if (dev->i2c_adapter)
+-		i2c_del_adapter(dev->i2c_adapter);
+-	kfree(dev->i2c_adapter);
+-	dev->i2c_adapter = NULL;
++	i2c_del_adapter(&dev->i2c_adapter);
+ 	mutex_unlock(&dev->i2c_mutex);
+ #endif /* CONFIG_I2C */
+ 
 diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
-index 49ae25d..8a5729a 100644
+index b0f046d..2107055 100644
 --- a/drivers/media/video/hdpvr/hdpvr.h
 +++ b/drivers/media/video/hdpvr/hdpvr.h
 @@ -102,7 +102,7 @@ struct hdpvr_device {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2037
retrieving revision 1.2038
diff -u -p -r1.2037 -r1.2038
--- kernel.spec	22 Jun 2010 01:28:10 -0000	1.2037
+++ kernel.spec	22 Jun 2010 16:01:59 -0000	1.2038
@@ -6,7 +6,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%global released_kernel 1
+%global released_kernel 0
 
 # Save original buildid for later if it's defined
 %if 0%{?buildid:1}
@@ -48,7 +48,7 @@ Summary: The Linux kernel
 # 1.1205.1.1.  In this case we drop the initial 1, subtract fedora_cvs_origin
 # from the second number, and then append the rest of the RCS string as is.
 # Don't stare at the awk too long, you'll go blind.
-%define fedora_cvs_origin   1991
+%define fedora_cvs_origin   2037
 %define fedora_cvs_revision() %2
 %global fedora_build %(echo %{fedora_cvs_origin}.%{fedora_cvs_revision $Revision$} | awk -F . '{ OFS = "."; ORS = ""; print $3 - $1 ; i = 4 ; OFS = ""; while (i <= NF) { print ".", $i ; i++} }')
 
@@ -80,7 +80,7 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 0
+%define rcrev 3
 # The git snapshot level
 %define gitrev 0
 # Set rpm version accordingly
@@ -123,12 +123,12 @@ Summary: The Linux kernel
 # Build the kernel-doc package, but don't fail the build if it botches.
 # Here "true" means "continue" and "false" means "fail the build".
 %if 0%{?released_kernel}
-%define doc_build_fail true
+%define doc_build_fail false
 %else
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 0
+%define rawhide_skip_docs 1
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %endif
@@ -148,7 +148,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 # (well, almost none, we need nonintconfig for build purposes). Default to 0 (off).
@@ -605,11 +605,9 @@ Patch11: git-bluetooth.patch
 # Standalone patches
 Patch20: linux-2.6-hotfixes.patch
 
-Patch21: linux-2.6-tracehook.patch
-Patch22: linux-2.6-utrace.patch
-Patch23: linux-2.6-utrace-ptrace.patch
-
-Patch50: linux-2.6-x86-cfi_sections.patch
+Patch30: git-utrace.patch
+Patch31: utrace-ptrace-fix-build.patch
+Patch32: utrace-remove-use-of-kref_set.patch
 
 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
 
@@ -626,19 +624,15 @@ Patch303: linux-2.6-enable-btusb-autosus
 Patch304: linux-2.6-usb-uvc-autosuspend.diff
 Patch305: linux-2.6-fix-btusb-autosuspend.patch
 
-Patch310: linux-2.6-usb-wwan-update.patch
-
 Patch380: linux-2.6-defaults-pci_no_msi.patch
 Patch383: linux-2.6-defaults-aspm.patch
 
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
-Patch392: linux-2.6-acpi-video-export-edid.patch
 Patch393: acpi-ec-add-delay-before-write.patch
 
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch452: linux-2.6.30-no-pcspkr-modalias.patch
-Patch453: thinkpad-acpi-add-x100e.patch
 Patch454: thinkpad-acpi-fix-backlight.patch
 
 Patch460: linux-2.6-serial-460800.patch
@@ -646,44 +640,27 @@ Patch460: linux-2.6-serial-460800.patch
 Patch470: die-floppy-die.patch
 
 Patch510: linux-2.6-silence-noise.patch
-Patch520: pci-hush-rom-warning.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
 
-Patch600: linux-2.6-acpi-sleep-live-sci-live.patch
-
 Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
 
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
 
-Patch690: iwlwifi-add-internal-short-scan-support-for-3945.patch
-Patch691: iwlwifi-Recover-TX-flow-stall-due-to-stuck-queue.patch
-Patch692: iwlwifi-move-plcp-check-to-separated-function.patch
-Patch693: iwlwifi-Recover-TX-flow-failure.patch
-Patch694: iwlwifi-code-cleanup-for-connectivity-recovery.patch
-Patch695: iwlwifi-iwl_good_ack_health-only-apply-to-AGN-device.patch
-Patch696: iwlwifi-recalculate-average-tpt-if-not-current.patch
-Patch697: iwlwifi-fix-internal-scan-race.patch
-Patch698: iwlwifi-recover_from_tx_stall.patch
-
 Patch800: linux-2.6-crash-driver.patch
 
 Patch900: linux-2.6-cantiga-iommu-gfx.patch
 
 # crypto/
-Patch1200: crypto-add-async-hash-testing.patch
 
 Patch1515: lirc-2.6.33.patch
 Patch1517: hdpvr-ir-enable.patch
 
 # virt + ksm patches
-Patch1550: virtqueue-wrappers.patch
-Patch1554: virt_console-rollup.patch
 Patch1555: fix_xen_guest_on_old_EC2.patch
 
 # DRM
-Patch1800: drm-next.patch
 Patch1801: drm-revert-drm-fbdev-rework-output-polling-to-be-back-in-core.patch
 Patch1802: revert-drm-kms-toggle-poll-around-switcheroo.patch
 # nouveau + drm fixes
@@ -708,44 +685,26 @@ Patch2802: linux-2.6-silence-acpi-blackl
 Patch2899: linux-2.6-v4l-dvb-fixes.patch
 Patch2900: linux-2.6-v4l-dvb-update.patch
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
-Patch2905: linux-2.6-v4l-dvb-gspca-fixes.patch
 
 Patch2910: linux-2.6-v4l-dvb-add-lgdt3304-support.patch
 Patch2911: linux-2.6-v4l-dvb-add-kworld-a340-support.patch
 
 # fs fixes
 
-Patch3011: btrfs-should-add-permission-check-for-setfacl.patch
-Patch3012: btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch
-
-
 # NFSv4
 
 # VIA Nano / VX8xx updates
 
 # patches headed upstream
-Patch12005: linux-2.6-input-hid-quirk-egalax.patch
 
-Patch12015: add-appleir-usb-driver.patch
 Patch12016: disable-i8042-check-on-apple-mac.patch
 
 Patch12017: prevent-runtime-conntrack-changes.patch
 
 Patch12018: neuter_intel_microcode_load.patch
 
-Patch12019: linux-2.6-umh-refactor.patch
-Patch12020: coredump-uid-pipe-check.patch
-
 Patch12030: ssb_check_for_sprom.patch
 
-Patch12035: quiet-prove_RCU-in-cgroups.patch
-
-Patch12040: iwlwifi-manage-QoS-by-mac-stack.patch
-Patch12041: mac80211-do-not-wipe-out-old-supported-rates.patch
-Patch12042: mac80211-explicitly-disable-enable-QoS.patch
-Patch12043: mac80211-fix-supported-rates-IE-if-AP-doesnt-give-us-its-rates.patch
-
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1155,13 +1114,12 @@ ApplyOptionalPatch linux-2.6-upstream-re
 ApplyPatch linux-2.6-hotfixes.patch
 
 # Roland's utrace ptrace replacement.
-ApplyPatch linux-2.6-tracehook.patch
-ApplyPatch linux-2.6-utrace.patch
-ApplyPatch linux-2.6-utrace-ptrace.patch
+ApplyPatch git-utrace.patch
+ApplyPatch utrace-ptrace-fix-build.patch
+ApplyPatch utrace-remove-use-of-kref_set.patch
 
 # Architecture patches
 # x86(-64)
-ApplyPatch linux-2.6-x86-cfi_sections.patch
 
 #
 # Intel IOMMU
@@ -1190,9 +1148,6 @@ ApplyPatch linux-2.6-execshield.patch
 # xfs
 
 # btrfs
-# CVE-2010-2071.
-ApplyPatch btrfs-should-add-permission-check-for-setfacl.patch
-ApplyPatch btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch
 
 
 # eCryptfs
@@ -1204,14 +1159,12 @@ ApplyPatch btrfs-prohibit-a-operation-of
 #ApplyPatch linux-2.6-enable-btusb-autosuspend.patch
 #ApplyPatch linux-2.6-usb-uvc-autosuspend.diff
 #ApplyPatch linux-2.6-fix-btusb-autosuspend.patch
-ApplyPatch linux-2.6-usb-wwan-update.patch
 
 # WMI
 
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
-ApplyPatch linux-2.6-acpi-video-export-edid.patch
 ApplyPatch acpi-ec-add-delay-before-write.patch
 
 # Various low-impact patches to aid debugging.
@@ -1234,7 +1187,6 @@ ApplyPatch linux-2.6-defaults-aspm.patch
 #
 
 # ACPI
-ApplyPatch linux-2.6-acpi-sleep-live-sci-live.patch
 
 # ALSA
 ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
@@ -1250,16 +1202,13 @@ ApplyPatch die-floppy-die.patch
 
 ApplyPatch linux-2.6.30-no-pcspkr-modalias.patch
 
-ApplyPatch linux-2.6-input-hid-quirk-egalax.patch
-ApplyPatch thinkpad-acpi-add-x100e.patch
-ApplyPatch thinkpad-acpi-fix-backlight.patch
+#ApplyPatch thinkpad-acpi-fix-backlight.patch
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
 
 # Silence some useless messages that still get printed with 'quiet'
 ApplyPatch linux-2.6-silence-noise.patch
-ApplyPatch pci-hush-rom-warning.patch
 
 # Make fbcon not show the penguins with 'quiet'
 ApplyPatch linux-2.6-silence-fbcon-logo.patch
@@ -1284,20 +1233,14 @@ ApplyPatch linux-2.6-cantiga-iommu-gfx.p
 
 # crypto/
 
-# Add async hash testing (a8f1a05)
-ApplyPatch crypto-add-async-hash-testing.patch
-
 # http://www.lirc.org/
 ApplyPatch lirc-2.6.33.patch
 # enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
 ApplyPatch hdpvr-ir-enable.patch
 
 # Assorted Virt Fixes
-ApplyPatch virtqueue-wrappers.patch
-ApplyPatch virt_console-rollup.patch
 ApplyPatch fix_xen_guest_on_old_EC2.patch
 
-ApplyPatch drm-next.patch
 ApplyPatch drm-revert-drm-fbdev-rework-output-polling-to-be-back-in-core.patch
 ApplyPatch revert-drm-kms-toggle-poll-around-switcheroo.patch
 
@@ -1321,44 +1264,18 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-fix
 ApplyOptionalPatch linux-2.6-v4l-dvb-update.patch
 ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
 
-ApplyPatch linux-2.6-v4l-dvb-gspca-fixes.patch
-
 ApplyPatch linux-2.6-v4l-dvb-add-lgdt3304-support.patch
 ApplyPatch linux-2.6-v4l-dvb-add-kworld-a340-support.patch
 
-ApplyPatch linux-2.6-phylib-autoload.patch
+#ApplyPatch linux-2.6-phylib-autoload.patch
 
 # Patches headed upstream
-ApplyPatch add-appleir-usb-driver.patch
 ApplyPatch disable-i8042-check-on-apple-mac.patch
 
 ApplyPatch neuter_intel_microcode_load.patch
 
-# Refactor UserModeHelper code & satisfy abrt recursion check request
-#ApplyPatch linux-2.6-umh-refactor.patch
-#ApplyPatch coredump-uid-pipe-check.patch
-
 # rhbz#533746
-ApplyPatch ssb_check_for_sprom.patch
-
-# iwlwifi fixes from F-13-2.6.33
-ApplyPatch iwlwifi-add-internal-short-scan-support-for-3945.patch
-ApplyPatch iwlwifi-Recover-TX-flow-stall-due-to-stuck-queue.patch
-ApplyPatch iwlwifi-move-plcp-check-to-separated-function.patch
-ApplyPatch iwlwifi-Recover-TX-flow-failure.patch
-ApplyPatch iwlwifi-code-cleanup-for-connectivity-recovery.patch
-ApplyPatch iwlwifi-iwl_good_ack_health-only-apply-to-AGN-device.patch
-ApplyPatch iwlwifi-recalculate-average-tpt-if-not-current.patch
-ApplyPatch iwlwifi-fix-internal-scan-race.patch
-ApplyPatch iwlwifi-recover_from_tx_stall.patch
-
-# mac80211/iwlwifi fix connections to some APs (rhbz#558002)
-ApplyPatch mac80211-explicitly-disable-enable-QoS.patch
-ApplyPatch iwlwifi-manage-QoS-by-mac-stack.patch
-ApplyPatch mac80211-do-not-wipe-out-old-supported-rates.patch
-ApplyPatch mac80211-fix-supported-rates-IE-if-AP-doesnt-give-us-its-rates.patch
-
-ApplyPatch quiet-prove_RCU-in-cgroups.patch
+#ApplyPatch ssb_check_for_sprom.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1991,6 +1908,14 @@ fi
 #                 ||     ||
 
 %changelog
+* Tue Jun 22 2010 Kyle McMartin <kyle at redhat.com> 2.6.35-0.1.rc3.git0
+- Putting the raw back into rawhide... Yeehaw.
+- 2.6.35-rc3
+- Drop a tonne of patches that were merged upstream, or were backports.
+- Rebase execshield, utrace.
+- Fix up a bunch of rejects, build failures.
+- Fix up lirc to build with strict copy_from_user checking.
+
 * Mon Jun 21 2010 Dave Jones <davej at redhat.com>
 - Disable workaround for obscure SMP pentium pro errata.
   I miss the 1990s too, but it's time to move on.
@@ -2148,492 +2073,8 @@ fi
 * Sun May 16 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-1
 - Linux 2.6.34
 
-* Fri May 14 2010 Roland McGrath <roland at redhat.com> 2.6.34-0.56.rc7.git4
-- x86: put assembly CFI in .debug_frame
-
-* Thu May 13 2010 Dave Jones <davej at redhat.com>
-- 2.6.34-rc7-git4
-
-* Wed May 12 2010 Chuck Ebbert <cebbert at redhat.com>
-- Linux 2.6.34-rc7-git3
-- Fix up utrace.patch
-- Drop autofs-fix-link_count-usage.patch
-
-* Mon May 10 2010 Kyle McMartin <kyle at redhat.com>
-- Don't link perf against libbfd.a.
-
-* Mon May 10 2010 Kyle McMartin <kyle at redhat.com>
-- fs-explicitly-pass-in-whether-sb-is-pinned-or-not.patch  (rhbz#588930)
-
-* Mon May 10 2010 Kyle McMartin <kyle at redhat.com>
-- linux-2.6-input-hid-quirk-egalax.patch: copy from F-13^H2.
-
-* Mon May 10 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.49.rc7.git0
-- autofs: Patch from Ian Kent to fix non-top level mounts. (rhbz#583483)
-
-* Sun May 09 2010 Kyle McMartin <kyle at redhat.com>
-- Linux 2.6.34-rc7
-
-* Sun May 09 2010 Chuck Ebbert <cebbert at redhat.com>
-- Linux 2.6.34-rc6-git6
-- Fix linux-2.6-v4l-dvb-gspca-fixes.patch to apply after latest V4L push
-- CONFIG_HWMON=y to allow CONFIG_ACERHDF=m on x86
-- CONFIG_MICREL_PHY=m
-
-* Sat May 08 2010 Kyle McMartin <kyle at redhat.com>
-- Link perf against libbfd.a for name-demangling support. (rhbz#590289)
-
-* Fri Apr 30 2010 Chuck Ebbert <cebbert at redhat.com>
-- Linux 2.6.34-rc6-git1
-
-* Fri Apr 30 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.44.rc6.git0
-- Linux 2.6.34-rc6
-- USB_SIERRA_NET=m
-
-* Mon Apr 26 2010 Chuck Ebbert <cebbert at redhat.com>
-- Linux 2.6.34-rc5-git7
-- Drop merged patches:
-    linux-2.6-pci-fixup-resume.patch
-    drm-intel-acpi-populate-didl.patch
-- New config options:
-    CONFIG_USB_IPHETH=m
-    CONFIG_VMWARE_BALLOON=m
-
-* Thu Apr 22 2010 Chuck Ebbert <cebbert at redhat.com>
-- Linux 2.6.34-rc5-git3
-
-* Thu Apr 22 2010 Matthew Garrett <mjg at redhat.com>
-- linux-2.6-pci-fixup-resume.patch: make sure we enable power resources on D0
-
-* Wed Apr 21 2010 Chuck Ebbert <cebbert at redhat.com>
-- Linux 2.6.34-rc5-git1
-- New config option: CONFIG_QUOTA_DEBUG enabled for debug kernels
-
-* Wed Apr 21 2010 Matthew Garrett <mjg at redhat.com>
-- thinkpad-acpi-add-x100e.patch: Add EC path for Thinkpad X100
-
-* Mon Apr 19 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.38.rc5.git0
-- Linux 2.6.34-rc5
-
-* Mon Apr 19 2010 Matthew Garrett <mjg at redhat.com>
-- linux-2.6-acpi-sleep-live-sci-live.patch: Try harder to switch to ACPI mode
-
-* Fri Apr 16 2010 Chuck Ebbert <cebbert at redhat.com>
-- Linux 2.6.34-rc4-git4
-
-* Thu Apr 15 2010 Eric Paris <eparis at redhat.com>
-- enable CONFIG_INTEL_TXT for x86_64
-
-* Tue Apr 13 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34-0.34.rc4.git0
-- Linux 2.6.34-rc4
-
-* Sat Apr 10 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34-0.33.rc3.git10
-- Linux 2.6.34-rc3-git10
-
-* Fri Apr 09 2010 Chuck Ebbert <cebbert at redhat.com>
-- Fix build of qcserial and usb_wwan drivers
-
-* Fri Apr 09 2010 Chuck Ebbert <cebbert at redhat.com>
-- Linux 2.6.34-rc3-git9
-
-* Wed Apr 07 2010 Chuck Ebbert <cebbert at redhat.com>
-- Linux 2.6.34-rc3-git6
-- Trivial fix to context in v4l-gspca-fixes.patch
-- New option: CONFIG_CHELSIO_T4=m
-
-* Tue Apr 06 2010 Hans de Goede <hdegoede at redhat.com>
-- gspca-vc032x: Use YUYV output for OV7670 (#537332)
-
-* Mon Apr 05 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34-0.28.rc3.git3
-- Linux 2.6.34-rc3-git3
-
-* Sat Apr 03 2010 Chuck Ebbert <cebbert at redhat.com>
-- Build all of the DVB frontend drivers instead of just the automatically
-  selected ones. (#578755)
-
-* Sat Apr 03 2010 Chuck Ebbert <cebbert at redhat.com>
-- Linux 2.6.34-rc3-git2
-- New config option: CONFIG_EEEPC_WMI=m on x86 and x86_64
-- Also set CONFIG_EEEPC_LAPTOP=m on both 32- and 64-bit x86.
-
-* Thu Apr 01 2010 Matthew Garrett <mjg at redhat.com>
-- drm-intel-acpi-populate-didl.patch: Fix brightness hotkeys on some machines
-- linux-2.6-usb-wwan-update.patch: Update wwan code and fix qcserial
-
-* Wed Mar 31 2010 Matthew Garrett <mjg at redhat.com>
-- drm-intel-make-lvds-work.patch: Make sure LVDS gets turned back on
-
-* Tue Mar 30 2010 Kyle McMartin <kyle at redhat.com>
-- nuke linux-2.6-g5-therm-shutdown.patch, upstream now
-- nuke linux-2.6-dell-laptop-rfkill-fix.patch, upstream in different form
-- nuke linux-2.6-nfs4-callback-hidden.patch, upstream now
-- rebase hda_intel-prealloc-4mb-dmabuffer.patch
-- rebase linux-2.6-execshield.patch
-- rebase linux-2.6-input-kill-stupid-messages.patch
-- rebase die-floppy-die.patch
-- rebase linux-2.6-crash-driver.patch
-- nuke some other upstream patches, or patches that have been unapplied
-  for a very long time
-
-* Mon Mar 29 2010 Kyle McMartin <kyle at redhat.com>
-- rebase linux-2.6-utrace-ptrace.patch
-
-* Mon Mar 29 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.19.rc2.git4
-- 2.6.34-rc2-git4
-
-* Fri Mar 26 2010 Dave Jones <davej at redhat.com> 2.6.34-0.18.rc2.git2
-- 2.6.34-rc2-git2
-
-* Tue Mar 23 2010 Dave Jones <davej at redhat.com> 2.6.34-0.17.rc2.git1
-- 2.6.34-rc2-git1
-
-* Mon Mar 22 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.16.rc2.git0
-- Turn off NO_BOOTMEM on i386/x86_64.
-
-* Mon Mar 22 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.15.rc2.git0
-- 2.6.34-rc2
-- generic:
- - CEFS distributed filesystem (=m)
- - PPS (pulse per second) (off, excessively niche.)
- - smsc75xx usb gigabit ethernet (=m)
-- x86:
- - dell netbook LEDs (=m)
-- sparc64:
- - xvr1000 framebuffer (=y)
-
-* Fri Mar 19 2010 Hans de Goede <hdegoede at redhat.com>
-- Cherry pick various webcam driver fixes
-  (#571188, #572302, #572373)
-
-* Fri Mar 19 2010 David Woodhouse <David.Woodhouse at intel.com>
-- Apply fix for #538163 again (Cantiga shadow GTT chipset b0rkage).
-
-* Thu Mar 18 2010 Neil Horman <nhorman at redhat.com>
-- Disable TIPC in config
-
-* Thu Mar 11 2010 Kyle McMartin <kyle at redhat.com> 2.6.34.0.11-rc1.git1
-- 2.6.34-rc1-git1
-
-* Mon Mar 08 2010 Kyle McMartin <kyle at redhat.com> 2.6.34.0.10-rc1.git0
-- 2.6.34-rc1
-- Flipped a bunch of stuff that went tristate => bool off, a bunch of
-  MFD devices mostly. If any of it is actually useful, give us a holler.
-
-* Sun Mar 07 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.8.rc0.git13
-- 2.6.33-git13
-
-* Sat Mar 06 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.8.rc0.git11
-- Disable usb_autosuspend for now. (Needs rebasing.)
-
-* Sat Mar 06 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.7.rc0.git11
-- 2.6.33-git11
-- config changes:
- - debug flavours:
-  - PROVE_RCU
-  - PM_ADVANCED_DEBUG
-  - DMADEVICES_DEBUG (and VDEBUG)
- - arm:
-  - PERF_EVENTS enabled
- - sparc:
-  - GRETH module
- - generic:
-  - IP_VS_PROTO_SCTP=y
-  - BRIDGE_IGMP_SNOOPING=y
-  - NETFILTER_XT_TARGET_CT=m
-  - NF_CONNTRACK_ZONES=y
-  - MACVTAP=m
-  - KSZ884X_PCI=m
-  - IXGBEVF=m
-  - QLCNIC=m
-  - LIBERTAS_MESH=y
-  - RT2800USB, RT2800PCI added devices enabled
-  - CAN_PLX_PCI=m (?)
-  - VGA_ARB_MAX_GPUS=16
-  - various DVB/VIDEO enables
-  - OPTPROBES=y
-  - REGULATOR framework disabled.
- - x86:
-  - VGA_SWITCHEROO enabled.
-
-* Sat Mar 06 2010 Kyle McMartin <kyle at redhat.com>
-- Add requires on libdwarf if with_perftool.
-
-* Mon Mar 01 2010 Dave Jones <davej at redhat.com>
-- Don't own /usr/src/kernels any more, it's now owned by filesystem. (#569438)
-
-* Fri Feb 26 2010 Kyle McMartin <kyle at redhat.com> 2.6.34-0.4.rc0.git2
-- Start of the 2.6.34 series in rawhide.
-- Trim changelog.
-
-* Wed Feb 24 2010 Chuck Ebbert <cebbert at redhat.com>
-- Remove obsolete config options with scripts/sort-config -nfi
-  (generated .configs are unchanged)
-
-* Wed Feb 24 2010 Chuck Ebbert <cebbert at redhat.com>
-- Drop/clear obsolete V4L patches, use ApplyOptionalPatch
-
-* Wed Feb 24 2010 Chuck Ebbert <cebbert at redhat.com>
-- Linux 2.6.33
-
-* Wed Feb 24 2010 Dave Jones <davej at redhat.com>
-- Remove unnecessary redefinition of KEY_RFKILL from linux-2.6-rfkill-all.patch
-
-* Mon Feb 22 2010 Dave Jones <davej at redhat.com> 2.6.33-0.51.rc8.git6
-- 2.6.33-rc8-git6
-
-* Mon Feb 22 2010 Neil Horman <nhorman at redhat.com>
-- Fix a problem with coredump path checking uids on files when coredump
-  target is a pipe.
-
-* Sun Feb 21 2010 Hans de Goede <hdegoede at redhat.com>
-- Rebase gspca usb webcam driver + sub drivers to latest upstream, this
-  adds support for the following webcam bridge chipsets: benq, cpia1, sn9c2028;
-  and support for new devices and many bugfixes in other gspca-subdrivers
-
-* Fri Feb 19 2010 Ben Skeggs <bskeggs at redhat.com> 2.6.33-0.48.rc8.git1
-- nouveau: update to new interface version
-
-* Wed Feb 17 2010 Chuck Ebbert <cebbert at redhat.com>
-- This branch is now for the F-14 release.
-
-* Tue Feb 16 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.46.rc8.git1
-- 2.6.33-rc8-git1
-- virt_console-rollup.patch: fixes from linux-next from Amit.
-
-* Mon Feb 15 2010 Neil Horman <nhorman at redhat.com>
-- Refactor usermodehelper code and change recursion check for abrt
-  with linux-2.6-umh-refactor.patch from -mm
-  fixes bz 557386
-
-* Fri Feb 12 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.33-0.44.rc8
-- 2.6.33-rc8
-
-* Fri Feb 12 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.33-0.43.rc7.git6
-- 2.6.33-rc7-git6
-
-* Thu Feb 11 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.33-0.42.rc7.git5
-- 2.6.33-rc7-git5
-- Drop merged patches:
-  fix-conntrack-bug-with-namespaces.patch
-  commit ad60a9154887bb6162e427b0969fefd2f34e94a6 from git-bluetooth.patch
-
-* Mon Feb 08 2010 Josh Boyer <jwboyer at gmail.com>
-- Drop ppc ps3_storage and imac-transparent bridge patches
-
-* Sat Feb 06 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.40.rc7.git0
-- Add libdwarf-devel to build deps so perf gets linked to it.
-
-* Sat Feb 06 2010 Kyle McMartin <kyle at redhat.com>
-- virt_console-rollup.patch, for feature F13/VirtioSerial, patches
-  are all targetted at 2.6.34 (and in linux-next.)
-
-* Sat Feb 06 2010 Kyle McMartin <kyle at redhat.com>
-- git-bluetooth.patch: selection of backports from next for hadess.
-  (rhbz#562245)
-
-* Sat Feb 06 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.36.rc7.git0
-- Linux 2.6.33-rc7 (oops, jumped the gun on -git6 I guess. :)
-
-* Sat Feb 06 2010 Kyle McMartin <kyle at redhat.com>
-- 2.6.33-rc6-git6
-
-* Sat Feb 06 2010 Kyle McMartin <kyle at redhat.com>
-- Hack around delay loading microcode.ko, on intel, we don't split out
-  the firmware into cpuid specific versions (in fact, I don't know who does...)
-  so just patch out the request_firmware calls in microcode_intel.c, and
-  microcode_ctl.init will do the right thing. (fixes rhbz#560031)
-  (side note: I'll fix microcode_ctl to do one better at some point.)
-
-* Sat Feb 06 2010 Kyle McMartin <kyle at redhat.com>
-- Don't want linux-firmware if %with_firmware, yet. (Think F-11/F-12 2.6.33)
-
-* Fri Feb 05 2010 Peter Jones <pjones at redhat.com>
-- Move initrd creation to %%posttrans
-  Resolves: rhbz#557922
-
-* Fri Feb 05 2010 Kyle McMartin <kyle at redhat.com>
-- If %with_firmware, continue with kernel-firmware, otherwise prereq on the
-  separate linux-firmware pkg. Thanks to dzickus for noticing.
-
-* Thu Feb 04 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.29.rc6.git4
-- 2.6.33-rc6-git4
-
-* Wed Feb 03 2010 Kyle McMartin <kyle at redhat.com>
-- prevent-runtime-conntrack-changes.patch: fix another conntrack issue
-  identified by jcm.
-
-* Wed Feb 03 2010 Kyle McMartin <kyle at redhat.com>
-- fix-conntrack-bug-with-namespaces.patch: Patch for issue identified
-  by jcm. (Ref: http://lkml.org/lkml/2010/2/3/112)
-
-* Mon Feb 02 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.33-0.26.rc6.git1
-- 2.6.33-rc6-git1
-
-* Fri Jan 29 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.33-0.25.rc6.git0
-- 2.6.33-rc6
-
-* Wed Jan 27 2010 Roland McGrath <roland at redhat.com> 2.6.33-0.24.rc5.git1
-- Fix include/ copying for kernel-devel.
-
-* Mon Jan 25 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.23.rc5.git1
-- 2.6.33-rc5-git1
-- arm: MTD_PISMO is not set
-
-* Mon Jan 25 2010 Dave Jones <davej at redhat.com>
-- Disable CONFIG_X86_CPU_DEBUG
-
-* Mon Jan 25 2010 Josh Boyer <jwboyer at gmail.com>
-- Turn off CONFIG_USB_FHCI_HCD.  It doesn't build
-
-* Fri Jan 22 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.20.rc5.git0
-- 2.6.33-rc5
-
-* Thu Jan 21 2010 Jarod Wilson <jarod at redhat.com>
-- Merge crystalhd powerpc build fix from airlied
-
-* Wed Jan 20 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.18.rc4.git7
-- 2.6.32-rc4-git7
-- dvb mantis drivers as modules
-
-* Wed Jan 20 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.17.rc4.git6
-- add appleir usb driver
-
-* Mon Jan 18 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.16.rc4.git6
-- 2.6.33-rc4-git6
-- execshield: rebase for mm_types.h reject
-
-* Mon Jan 18 2010 Kyle McMartin <kyle at redhat.com>
-- vhost_net-rollup.patch: https://fedoraproject.org/wiki/Features/VHostNet
-  from davem/net-next-2.6.git
-
-* Sat Jan 16 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.14.rc4.git3
-- DEBUG_STRICT_USER_COPY_CHECKS off for now, tickles issue in lirc_it87.c
-
-* Sat Jan 16 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.13.rc4.git3
-- 2.6.33-rc4-git3
-
-* Thu Jan 14 2010 Steve Dickson <steved at redhat.com>
-- Enabled the NFS4.1 (CONFIG_NFS_V4_1) kernel config
-
-* Wed Jan 13 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.11.rc4
-- Linux 2.6.33-rc4
-
-* Wed Jan 13 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-0.10.rc3.git5
-- 2.6.33-rc3-git5
-
-* Wed Jan 13 2010 Dave Airlie <airlied at redhat.com>
-- Add fbdev fix for multi-card primary console on x86-64
-- clean up all the drm- patches
-
-* Tue Jan 12 2010 Jarod Wilson <jarod at redhat.com>
-- Update lirc patch for 2.6.33 kfifo changes
-- Add Broadcom Crystal HD video decoder driver from staging
-
-* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com>
-- include/asm is gone, kludge it for now.
-
-* Mon Jan 11 2010 Dave Jones <davej at redhat.com>
-- Rebase exec-shield.
-
-* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com>
-- drop e1000 patch.
-
-* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com>
-- lirc broken due to kfifo mess.
-
-* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com>
-- drm-intel-big-hammer: fix IS_I855 macro.
-
-* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com>
-- Linux 2.6.33-rc3
-- utrace: rebased from roland's people page.
-- via-hwmon-temp-sensor.patch: upstream.
-- linux-2.6-defaults-alsa-hda-beep-off.patch: new config option supercedes.
-- readd nouveau ctxprogs as firmware/ like it should be.
-- linux-2.6-pci-cacheline-sizing.patch: upstream.
-- linux-2.6-intel-agp-clear-gtt.patch: upstream.
-- linux-2.6-nfsd4-proots.patch: upstream?
-- rebased the rest.
-
-* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.3-21
-- Linux 2.6.32.3
-- drm-intel-no-tv-hotplug.patch: re-add lost patch from F-12
-  2.6.31 (#522611, #544671)
-
-* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.2-20
-- Re-enable ATM_HE (#545289)
-
-* Fri Jan 08 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.2-19
-- Add another symbol to look for when generating modules.block
-
-* Thu Jan 07 2010 David Woodhouse <David.Woodhouse at intel.com> 2.6.32.2-18
-- Drop kernel-firmware package now that it's packaged separately.
-
-* Mon Jan 04 2010 Dave Jones <davej at redhat.com>
-- Drop some of the vm/spinlock taint patches. dump_stack() already does same.
-
-* Thu Dec 24 2009 Kyle McMartin <kyle at redhat.com> 2.6.32.2-15
-- Add patch from dri-devel to fix vblanks on r600.
-  [http://marc.info/?l=dri-devel&m=126137027403059&w=2]
-
-* Fri Dec 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.32.2-14
-- Linux 2.6.32.2
-- dropped upstream patches.
-
-* Fri Dec 18 2009 Roland McGrath <roland at redhat.com> - 2.6.32.1-13
-- minor utrace update
-
-* Thu Dec 17 2009 Matthew Garrett <mjg at redhat.com> 2.6.32.1-12
-- linux-2.6-driver-level-usb-autosuspend.diff: fix so it works properly...
-- linux-2.6-fix-btusb-autosuspend.patch: avoid bluetooth connection drops
-- linux-2.6-enable-btusb-autosuspend.patch: and default it to on
-- linux-2.6-autoload-wmi.patch: autoload WMI drivers
-
-* Thu Dec 17 2009 Jarod Wilson <jarod at redhat.com> 2.6.32.1-11
-- Split off onboard decode imon devices into pure input driver,
-  leaving lirc_imon for the ancient imon devices only
-- Fix NULL ptr deref in lirc_serial (#543886)
-- Assorted lirc_mceusb fixups suggested by Mauro
-- Dropped compat ioctls from lirc_dev, main ioctls should now be
-  compatible between 32-bit and 64-bit (also at Mauro's suggestion)
-
-* Wed Dec 16 2009 Roland McGrath <roland at redhat.com> 2.6.32.1-10
-- utrace update, now testing the utrace-based ptrace!
-
-* Mon Dec 14 2009 Kyle McMartin <kyle at redhat.com> 2.6.32.1-9
-- 2.6.32.1
-- ext4 patches and more...
-
-* Wed Dec 09 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-8
-- Add a patch off lkml from krh to fix perf when DEBUG_PERF_USE_VMALLOC
-  (rhbz#542791)
-- Re-enable CONFIG_DEBUG_PERF_USE_VMALLOC on debug kernels.
-
-* Wed Dec 09 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-7
-- ext4-fix-insufficient-checks-in-EXT4_IOC_MOVE_EXT.patch: CVE-2009-4131
-  fix insufficient permission checking which could result in arbitrary
-  data corruption by a local unprivileged user.
-
-* Tue Dec 08 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.32-6
-- Copy fix for #540580 from F-12.
-
-* Tue Dec 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-5
-- new rpm changes:
- - %{PACKAGE_VERSION} -> %{version}
- - %{PACKAGE_RELEASE} -> %{release}
-
-* Tue Dec 08 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-4
-- Disable CONFIG_DEBUG_PERF_USE_VMALLOC for now, causes issues
-  on x86_64. (rhbz#542791)
-
-* Mon Dec  7 2009 Justin M. Forbes <jforbes at redhat.com> 2.6.32-3
-- Allow userspace to adjust kvmclock offset (#530389)
-
-* Mon Dec  7 2009 Steve Dickson <steved at redhat.com> 2.6.32-2
-- Updated the NFS4 pseudo root code to the latest release.
-
-* Thu Dec 03 2009 Kyle McMartin <kyle at redhat.com> 2.6.32-1
-- Linux 2.6.32
+* Sun May 16 2010 Kyle McMartin <kyle at redhat.com>
+- Trimmed changelog, see CVS.
 
 ###
 # The following Emacs magic makes C-c C-e use UTC dates.

linux-2.6-defaults-pci_no_msi.patch:
 Documentation/kernel-parameters.txt |    3 +++
 drivers/pci/Kconfig                 |   12 ++++++++++++
 drivers/pci/msi.c                   |    9 +++++++++
 drivers/pci/pci.c                   |    2 ++
 drivers/pci/pci.h                   |    3 ++-
 5 files changed, 28 insertions(+), 1 deletion(-)

Index: linux-2.6-defaults-pci_no_msi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-defaults-pci_no_msi.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- linux-2.6-defaults-pci_no_msi.patch	30 Mar 2010 04:24:01 -0000	1.7
+++ linux-2.6-defaults-pci_no_msi.patch	22 Jun 2010 16:02:00 -0000	1.8
@@ -31,7 +31,7 @@ index 7858a11..b12fcad 100644
 +++ b/drivers/pci/Kconfig
 @@ -21,6 +21,18 @@ config PCI_MSI
  
- 	   If you don't know what to do here, say N.
+ 	   If you don't know what to do here, say Y.
  
 +config PCI_MSI_DEFAULT_ON
 +	def_bool y

linux-2.6-execshield.patch:
 arch/x86/include/asm/desc.h           |   25 ++++++
 arch/x86/include/asm/mmu.h            |    7 +
 arch/x86/include/asm/paravirt.h       |    6 +
 arch/x86/include/asm/paravirt_types.h |    3 
 arch/x86/include/asm/processor.h      |    3 
 arch/x86/kernel/cpu/common.c          |   14 +++
 arch/x86/kernel/paravirt.c            |    3 
 arch/x86/kernel/process_32.c          |   48 ++++++++++++
 arch/x86/kernel/traps.c               |  131 +++++++++++++++++++++++++++++++---
 arch/x86/mm/mmap.c                    |    5 +
 arch/x86/mm/setup_nx.c                |    6 +
 arch/x86/mm/tlb.c                     |    7 +
 arch/x86/vdso/vdso32-setup.c          |    2 
 arch/x86/xen/enlighten.c              |   21 +++++
 fs/binfmt_elf.c                       |   21 ++++-
 include/linux/mm.h                    |    8 +-
 include/linux/mm_types.h              |    3 
 include/linux/resource.h              |    5 +
 include/linux/sched.h                 |    7 +
 kernel/sysctl.c                       |   28 +++++++
 mm/mmap.c                             |  123 +++++++++++++++++++++++++++++--
 mm/mprotect.c                         |   10 ++
 mm/mremap.c                           |    4 -
 23 files changed, 463 insertions(+), 27 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- linux-2.6-execshield.patch	30 Mar 2010 04:24:01 -0000	1.117
+++ linux-2.6-execshield.patch	22 Jun 2010 16:02:00 -0000	1.118
@@ -1,34 +1,3 @@
-From 5006dd0fae6126c149868102c100cd90a20ef2e3 Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle at phobos.i.jkkm.org>
-Date: Mon, 29 Mar 2010 23:20:18 -0400
-Subject: execshield
-
----
- arch/x86/include/asm/desc.h           |   25 +++++++
- arch/x86/include/asm/mmu.h            |    7 ++
- arch/x86/include/asm/paravirt.h       |    6 ++
- arch/x86/include/asm/paravirt_types.h |    3 +
- arch/x86/include/asm/processor.h      |    3 +
- arch/x86/kernel/cpu/common.c          |   14 ++++
- arch/x86/kernel/paravirt.c            |    3 +
- arch/x86/kernel/process_32.c          |   48 ++++++++++++
- arch/x86/kernel/traps.c               |  129 ++++++++++++++++++++++++++++++---
- arch/x86/mm/mmap.c                    |    5 +-
- arch/x86/mm/setup_nx.c                |    6 ++
- arch/x86/mm/tlb.c                     |    7 ++
- arch/x86/vdso/vdso32-setup.c          |    2 +-
- arch/x86/xen/enlighten.c              |   21 ++++++
- fs/binfmt_elf.c                       |   21 +++++-
- include/linux/mm.h                    |    8 ++-
- include/linux/mm_types.h              |    3 +
- include/linux/resource.h              |    5 +-
- include/linux/sched.h                 |    7 ++
- kernel/sysctl.c                       |   28 +++++++
- mm/mmap.c                             |  123 +++++++++++++++++++++++++++++--
- mm/mprotect.c                         |   10 +++-
- mm/mremap.c                           |    4 +-
- 23 files changed, 461 insertions(+), 27 deletions(-)
-
 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
 index 617bd56..526248d 100644
 --- a/arch/x86/include/asm/desc.h
@@ -133,10 +102,10 @@ index db9ef55..19c2793 100644
  	void (*load_tls)(struct thread_struct *t, unsigned int cpu);
  #ifdef CONFIG_X86_64
 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index b753ea5..4893156 100644
+index 7e5c6a6..9de0cba 100644
 --- a/arch/x86/include/asm/processor.h
 +++ b/arch/x86/include/asm/processor.h
-@@ -162,6 +162,9 @@ static inline int hlt_works(int cpu)
+@@ -158,6 +158,9 @@ static inline int hlt_works(int cpu)
  
  #define cache_line_size()	(boot_cpu_data.x86_cache_alignment)
  
@@ -147,7 +116,7 @@ index b753ea5..4893156 100644
  
  extern struct pt_regs *idle_regs(struct pt_regs *);
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index 4868e4a..6c8d2ca 100644
+index 68e4a6f..40f5bb7 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
 @@ -802,6 +802,20 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
@@ -186,10 +155,10 @@ index 1db183e..238b97d 100644
  	.load_idt = native_load_idt,
  	.store_gdt = native_store_gdt,
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index f6c6266..8ac2589 100644
+index 8d12878..fde71df 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
-@@ -251,7 +251,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+@@ -243,7 +243,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
  void
  start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  {
@@ -200,7 +169,7 @@ index f6c6266..8ac2589 100644
  	regs->fs		= 0;
  	set_fs(USER_DS);
  	regs->ds		= __USER_DS;
-@@ -260,6 +263,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+@@ -252,6 +255,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
  	regs->cs		= __USER_CS;
  	regs->ip		= new_ip;
  	regs->sp		= new_sp;
@@ -212,9 +181,9 @@ index f6c6266..8ac2589 100644
  	/*
  	 * Free the old FP and other extended state
  	 */
-@@ -319,6 +327,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -311,6 +319,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	if (preload_fpu)
- 		prefetch(next->xstate);
+ 		prefetch(next->fpu.state);
  
 +	if (next_p->mm)
 +		load_user_cs_desc(cpu, next_p->mm);
@@ -222,7 +191,7 @@ index f6c6266..8ac2589 100644
  	/*
  	 * Reload esp0.
  	 */
-@@ -412,3 +423,40 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -404,3 +415,40 @@ unsigned long get_wchan(struct task_struct *p)
  	return 0;
  }
  
@@ -264,14 +233,14 @@ index f6c6266..8ac2589 100644
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 1168e44..c452918 100644
+index 142d70c..82a48b8 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
-@@ -115,6 +115,76 @@ die_if_kernel(const char *str, struct pt_regs *regs, long err)
- 	if (!user_mode_vm(regs))
- 		die(str, regs, err);
+@@ -109,6 +109,78 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
+ 	dec_preempt_count();
  }
-+
+ 
++#ifdef CONFIG_X86_32
 +static inline int
 +__compare_user_cs_desc(const struct desc_struct *desc1,
 +	const struct desc_struct *desc2)
@@ -341,10 +310,12 @@ index 1168e44..c452918 100644
 +
 +	return 0;
 +}
- #endif
- 
++#endif
++
  static void __kprobes
-@@ -273,6 +343,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
+ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
+ 	long error_code, siginfo_t *info)
+@@ -265,6 +337,29 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	if (!user_mode(regs))
  		goto gp_in_kernel;
  
@@ -374,7 +345,7 @@ index 1168e44..c452918 100644
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_no = 13;
  
-@@ -863,19 +956,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
+@@ -792,19 +887,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
  }
  
  #ifdef CONFIG_X86_32
@@ -510,10 +481,10 @@ index 02b442e..957bb67 100644
  			ret = addr;
  			goto up_fail;
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index b607239..e426a3f 100644
+index 65d8d79..1ea06f8 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
-@@ -334,6 +334,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
+@@ -335,6 +335,24 @@ static void xen_set_ldt(const void *addr, unsigned entries)
  	xen_mc_issue(PARAVIRT_LAZY_CPU);
  }
  
@@ -538,7 +509,7 @@ index b607239..e426a3f 100644
  static void xen_load_gdt(const struct desc_ptr *dtr)
  {
  	unsigned long va = dtr->address;
-@@ -960,6 +978,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+@@ -961,6 +979,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
  
  	.load_tr_desc = paravirt_nop,
  	.set_ldt = xen_set_ldt,
@@ -609,10 +580,10 @@ index 535e763..d114af6 100644
  			 * load_elf_interp() returns relocation
  			 * adjustment
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index e70f21b..44e6d63 100644
+index b969efb..19c41b0 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1259,7 +1259,13 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1263,7 +1263,13 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -659,11 +630,11 @@ index f1e914e..d2aef9a 100644
  /*
   * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index dad7f66..c5a3948 100644
+index f118809..043ad8e 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -102,6 +102,9 @@ struct fs_struct;
- struct bts_context;
+@@ -101,6 +101,9 @@ struct bio_list;
+ struct fs_struct;
  struct perf_event_context;
  
 +extern int exec_shield;
@@ -672,7 +643,7 @@ index dad7f66..c5a3948 100644
  /*
   * List of flags we want to share for kernel threads,
   * if only because they are not used by them anyway.
-@@ -390,6 +393,10 @@ extern void arch_pick_mmap_layout(struct mm_struct *mm);
+@@ -394,6 +397,10 @@ extern void arch_pick_mmap_layout(struct mm_struct *mm);
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
  		       unsigned long, unsigned long);
@@ -684,10 +655,10 @@ index dad7f66..c5a3948 100644
  arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
  			  unsigned long len, unsigned long pgoff,
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 8686b0f..a4fad81 100644
+index d24f761..fdb581b 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
-@@ -99,6 +99,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
+@@ -101,6 +101,26 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
  #ifndef CONFIG_MMU
  extern int sysctl_nr_trim_pages;
  #endif
@@ -714,7 +685,7 @@ index 8686b0f..a4fad81 100644
  #ifdef CONFIG_BLOCK
  extern int blk_iopoll_enabled;
  #endif
-@@ -400,6 +420,14 @@ static struct ctl_table kern_table[] = {
+@@ -428,6 +448,14 @@ static struct ctl_table kern_table[] = {
  		.mode		= 0644,
  		.proc_handler	= proc_dointvec,
  	},
@@ -730,7 +701,7 @@ index 8686b0f..a4fad81 100644
  	{
  		.procname	= "tainted",
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 75557c6..8173284 100644
+index 456ec6f..9351762 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -28,6 +28,7 @@
@@ -778,7 +749,7 @@ index 75557c6..8173284 100644
  }
  
  /*
-@@ -798,6 +815,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -790,6 +807,8 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  		} else					/* cases 2, 5, 7 */
  			err = vma_adjust(prev, prev->vm_start,
  				end, prev->vm_pgoff, NULL);
@@ -787,7 +758,7 @@ index 75557c6..8173284 100644
  		if (err)
  			return NULL;
  		return prev;
-@@ -952,7 +971,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -982,7 +1001,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -797,7 +768,7 @@ index 75557c6..8173284 100644
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1504,8 +1524,8 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1534,8 +1554,8 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  }
  
  unsigned long
@@ -808,7 +779,7 @@ index 75557c6..8173284 100644
  {
  	unsigned long (*get_area)(struct file *, unsigned long,
  				  unsigned long, unsigned long, unsigned long);
-@@ -1518,7 +1538,11 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1548,7 +1568,11 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  	if (len > TASK_SIZE)
  		return -ENOMEM;
  
@@ -821,7 +792,7 @@ index 75557c6..8173284 100644
  	if (file && file->f_op && file->f_op->get_unmapped_area)
  		get_area = file->f_op->get_unmapped_area;
  	addr = get_area(file, addr, len, pgoff, flags);
-@@ -1532,8 +1556,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+@@ -1562,8 +1586,76 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
  
  	return arch_rebalance_pgtables(addr, len);
  }
@@ -899,7 +870,7 @@ index 75557c6..8173284 100644
  
  /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
  struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
-@@ -1608,6 +1700,16 @@ out:
+@@ -1638,6 +1730,16 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -916,7 +887,7 @@ index 75557c6..8173284 100644
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1624,7 +1726,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1654,7 +1756,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -925,7 +896,7 @@ index 75557c6..8173284 100644
  		return -ENOMEM;
  
  	/* mlock limit tests */
-@@ -1936,10 +2038,14 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1966,10 +2068,14 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
  
@@ -942,7 +913,7 @@ index 75557c6..8173284 100644
  		err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
  	/* Success. */
-@@ -2223,6 +2329,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2254,6 +2360,7 @@ void exit_mmap(struct mm_struct *mm)
  
  	free_pgtables(tlb, vma, FIRST_USER_ADDRESS, 0);
  	tlb_finish_mmu(tlb, 0, end);
@@ -951,10 +922,10 @@ index 75557c6..8173284 100644
  	/*
  	 * Walk the list again, actually closing and freeing it,
 diff --git a/mm/mprotect.c b/mm/mprotect.c
-index 8bc969d..3c9b4fc 100644
+index 2d1bf7c..4ea460e 100644
 --- a/mm/mprotect.c
 +++ b/mm/mprotect.c
-@@ -26,9 +26,14 @@
+@@ -25,9 +25,14 @@
  #include <linux/perf_event.h>
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
@@ -969,7 +940,7 @@ index 8bc969d..3c9b4fc 100644
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
  {
-@@ -139,7 +144,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -138,7 +143,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	struct mm_struct *mm = vma->vm_mm;
  	unsigned long oldflags = vma->vm_flags;
  	long nrpages = (end - start) >> PAGE_SHIFT;
@@ -978,7 +949,7 @@ index 8bc969d..3c9b4fc 100644
  	pgoff_t pgoff;
  	int error;
  	int dirty_accountable = 0;
-@@ -204,6 +209,9 @@ success:
+@@ -203,6 +208,9 @@ success:
  		dirty_accountable = 1;
  	}
  
@@ -989,10 +960,10 @@ index 8bc969d..3c9b4fc 100644
  	if (is_vm_hugetlb_page(vma))
  		hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
 diff --git a/mm/mremap.c b/mm/mremap.c
-index e9c75ef..0a5379f 100644
+index cde56ee..4c65678 100644
 --- a/mm/mremap.c
 +++ b/mm/mremap.c
-@@ -488,10 +488,10 @@ unsigned long do_mremap(unsigned long addr,
+@@ -487,10 +487,10 @@ unsigned long do_mremap(unsigned long addr,
  		if (vma->vm_flags & VM_MAYSHARE)
  			map_flags |= MAP_SHARED;
  
@@ -1005,6 +976,3 @@ index e9c75ef..0a5379f 100644
  		if (new_addr & ~PAGE_MASK) {
  			ret = new_addr;
  			goto out;
--- 
-1.7.0.1
-

lirc-2.6.33.patch:
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  116 +
 drivers/input/lirc/Makefile           |   21 
 drivers/input/lirc/lirc_bt829.c       |  384 +++++
 drivers/input/lirc/lirc_dev.c         |  736 ++++++++++
 drivers/input/lirc/lirc_dev.h         |  225 +++
 drivers/input/lirc/lirc_ene0100.c     |  646 +++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  536 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 +++++++
 drivers/input/lirc/lirc_imon.c        | 1059 ++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  991 +++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  542 +++++++
 drivers/input/lirc/lirc_mceusb.c      | 1222 +++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 +++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 
 drivers/input/lirc/lirc_sasem.c       |  935 +++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1317 ++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 +++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1396 +++++++++++++++++++
 drivers/input/misc/Kconfig            |   12 
 drivers/input/misc/Makefile           |    1 
 drivers/input/misc/imon.c             | 2430 ++++++++++++++++++++++++++++++++++
 include/linux/lirc.h                  |   94 +
 28 files changed, 16717 insertions(+)

Index: lirc-2.6.33.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/lirc-2.6.33.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lirc-2.6.33.patch	12 Jan 2010 21:14:29 -0000	1.1
+++ lirc-2.6.33.patch	22 Jun 2010 16:02:02 -0000	1.2
@@ -1,133 +1,3 @@
- include/linux/lirc.h                  |   94 ++
- drivers/input/Kconfig                 |    2 +
- drivers/input/Makefile                |    2 +
- drivers/input/lirc/Kconfig            |  116 ++
- drivers/input/lirc/Makefile           |   21 +
- drivers/input/lirc/lirc_bt829.c       |  383 ++++++
- drivers/input/lirc/lirc_dev.c         |  736 ++++++++++
- drivers/input/lirc/lirc_dev.h         |  225 +++
- drivers/input/lirc/lirc_ene0100.c     |  646 +++++++++
- drivers/input/lirc/lirc_ene0100.h     |  169 +++
- drivers/input/lirc/lirc_i2c.c         |  536 ++++++++
- drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
- drivers/input/lirc/lirc_imon.c        | 1054 ++++++++++++++
- drivers/input/lirc/lirc_it87.c        |  991 ++++++++++++++
- drivers/input/lirc/lirc_it87.h        |  116 ++
- drivers/input/lirc/lirc_ite8709.c     |  540 ++++++++
- drivers/input/lirc/lirc_mceusb.c      | 1222 +++++++++++++++++
- drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
- drivers/input/lirc/lirc_parallel.h    |   26 +
- drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
- drivers/input/lirc/lirc_serial.c      | 1317 ++++++++++++++++++
- drivers/input/lirc/lirc_sir.c         | 1283 +++++++++++++++++
- drivers/input/lirc/lirc_streamzap.c   |  794 +++++++++++
- drivers/input/lirc/lirc_ttusbir.c     |  397 ++++++
- drivers/input/lirc/lirc_zilog.c       | 1396 +++++++++++++++++++
- drivers/input/misc/Kconfig            |   12 +
- drivers/input/misc/Makefile           |    1 +
- drivers/input/misc/imon.c             | 2430 +++++++++++++++++++++++++++++++++
- 28 files changed, 16705 insertions(+), 0 deletions(-)
-
-diff --git a/include/linux/lirc.h b/include/linux/lirc.h
-new file mode 100644
-index 0000000..8ae64fa
---- /dev/null
-+++ b/include/linux/lirc.h
-@@ -0,0 +1,94 @@
-+/*
-+ * lirc.h - linux infrared remote control header file
-+ * last modified 2007/09/27
-+ */
-+
-+#ifndef _LINUX_LIRC_H
-+#define _LINUX_LIRC_H
-+
-+#include <linux/types.h>
-+#include <linux/ioctl.h>
-+
-+#define PULSE_BIT  0x01000000
-+#define PULSE_MASK 0x00FFFFFF
-+
-+/*** lirc compatible hardware features ***/
-+
-+#define LIRC_MODE2SEND(x) (x)
-+#define LIRC_SEND2MODE(x) (x)
-+#define LIRC_MODE2REC(x) ((x) << 16)
-+#define LIRC_REC2MODE(x) ((x) >> 16)
-+
-+#define LIRC_MODE_RAW                  0x00000001
-+#define LIRC_MODE_PULSE                0x00000002
-+#define LIRC_MODE_MODE2                0x00000004
-+#define LIRC_MODE_LIRCCODE             0x00000010
-+
-+
-+#define LIRC_CAN_SEND_RAW              LIRC_MODE2SEND(LIRC_MODE_RAW)
-+#define LIRC_CAN_SEND_PULSE            LIRC_MODE2SEND(LIRC_MODE_PULSE)
-+#define LIRC_CAN_SEND_MODE2            LIRC_MODE2SEND(LIRC_MODE_MODE2)
-+#define LIRC_CAN_SEND_LIRCCODE         LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
-+
-+#define LIRC_CAN_SEND_MASK             0x0000003f
-+
-+#define LIRC_CAN_SET_SEND_CARRIER      0x00000100
-+#define LIRC_CAN_SET_SEND_DUTY_CYCLE   0x00000200
-+#define LIRC_CAN_SET_TRANSMITTER_MASK  0x00000400
-+
-+#define LIRC_CAN_REC_RAW               LIRC_MODE2REC(LIRC_MODE_RAW)
-+#define LIRC_CAN_REC_PULSE             LIRC_MODE2REC(LIRC_MODE_PULSE)
-+#define LIRC_CAN_REC_MODE2             LIRC_MODE2REC(LIRC_MODE_MODE2)
-+#define LIRC_CAN_REC_LIRCCODE          LIRC_MODE2REC(LIRC_MODE_LIRCCODE)
-+
-+#define LIRC_CAN_REC_MASK              LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
-+
-+#define LIRC_CAN_SET_REC_CARRIER       (LIRC_CAN_SET_SEND_CARRIER << 16)
-+#define LIRC_CAN_SET_REC_DUTY_CYCLE    (LIRC_CAN_SET_SEND_DUTY_CYCLE << 16)
-+
-+#define LIRC_CAN_SET_REC_DUTY_CYCLE_RANGE 0x40000000
-+#define LIRC_CAN_SET_REC_CARRIER_RANGE    0x80000000
-+#define LIRC_CAN_GET_REC_RESOLUTION       0x20000000
-+
-+#define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK)
-+#define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK)
-+
-+#define LIRC_CAN_NOTIFY_DECODE            0x01000000
-+
-+/*** IOCTL commands for lirc driver ***/
-+
-+#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, uint64_t)
-+
-+#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, uint64_t)
-+#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, uint64_t)
-+#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, uint32_t)
-+#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, uint32_t)
-+#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, uint32_t)
-+#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, uint32_t)
-+#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, uint32_t)
-+
-+/* code length in bits, currently only for LIRC_MODE_LIRCCODE */
-+#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, uint64_t)
-+
-+#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, uint64_t)
-+#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, uint64_t)
-+/* Note: these can reset the according pulse_width */
-+#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, uint32_t)
-+#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, uint32_t)
-+#define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, uint32_t)
-+#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, uint32_t)
-+#define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, uint32_t)
-+
-+/*
-+ * to set a range use
-+ * LIRC_SET_REC_DUTY_CYCLE_RANGE/LIRC_SET_REC_CARRIER_RANGE with the
-+ * lower bound first and later
-+ * LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound
-+ */
-+
-+#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, uint32_t)
-+#define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, uint32_t)
-+
-+#define LIRC_NOTIFY_DECODE             _IO('i', 0x00000020)
-+
-+#endif
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index 07c2cd4..ebc8743 100644
 --- a/drivers/input/Kconfig
@@ -302,10 +172,10 @@ index 0000000..9122e87
 +obj-$(CONFIG_LIRC_ZILOG)	+= lirc_zilog.o
 diff --git a/drivers/input/lirc/lirc_bt829.c b/drivers/input/lirc/lirc_bt829.c
 new file mode 100644
-index 0000000..0485884
+index 0000000..b3c9967
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_bt829.c
-@@ -0,0 +1,383 @@
+@@ -0,0 +1,384 @@
 +/*
 + * Remote control driver for the TV-card based on bt829
 + *
@@ -424,7 +294,7 @@ index 0000000..0485884
 +	dprintk("driver is closed\n");
 +}
 +
-+int init_module(void)
++static int __init atir_init_module(void)
 +{
 +	struct pci_dev *pdev;
 +
@@ -455,13 +325,14 @@ index 0000000..0485884
 +
 +	return 0;
 +}
++module_init(atir_init_module);
 +
 +
-+void cleanup_module(void)
++static void __exit atir_cleanup_module(void)
 +{
 +	lirc_unregister_driver(atir_minor);
 +}
-+
++module_exit(atir_cleanup_module);
 +
 +static int atir_init_start(void)
 +{
@@ -3033,7 +2904,7 @@ index 0000000..f3f8c2e
 +module_exit(lirc_i2c_exit);
 diff --git a/drivers/input/lirc/lirc_igorplugusb.c b/drivers/input/lirc/lirc_igorplugusb.c
 new file mode 100644
-index 0000000..599037d
+index 0000000..c6ed3f5
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_igorplugusb.c
 @@ -0,0 +1,556 @@
@@ -3446,7 +3317,7 @@ index 0000000..599037d
 +		goto mem_failure_switch;
 +	}
 +
-+	ir->buf_in = usb_buffer_alloc(dev,
++	ir->buf_in = usb_alloc_coherent(dev,
 +			      DEVICE_BUFLEN+DEVICE_HEADERLEN,
 +			      GFP_ATOMIC, &ir->dma_in);
 +	if (!ir->buf_in) {
@@ -3478,7 +3349,7 @@ index 0000000..599037d
 +
 +	switch (mem_failure) {
 +	case 9:
-+		usb_buffer_free(dev, DEVICE_BUFLEN+DEVICE_HEADERLEN,
++		usb_free_coherent(dev, DEVICE_BUFLEN+DEVICE_HEADERLEN,
 +			ir->buf_in, ir->dma_in);
 +	case 3:
 +		kfree(driver);
@@ -3536,7 +3407,7 @@ index 0000000..599037d
 +	ir->usbdev = NULL;
 +	wake_up_all(&ir->wait_out);
 +
-+	usb_buffer_free(dev, ir->len_in, ir->buf_in, ir->dma_in);
++	usb_free_coherent(dev, ir->len_in, ir->buf_in, ir->dma_in);
 +
 +	unregister_from_lirc(ir);
 +}
@@ -3595,10 +3466,10 @@ index 0000000..599037d
 +
 diff --git a/drivers/input/lirc/lirc_imon.c b/drivers/input/lirc/lirc_imon.c
 new file mode 100644
-index 0000000..5bea43b
+index 0000000..d9d83bd
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_imon.c
-@@ -0,0 +1,1054 @@
+@@ -0,0 +1,1059 @@
 +/*
 + *   lirc_imon.c:  LIRC/VFD/LCD driver for SoundGraph iMON IR/VFD/LCD
 + *		   including the iMON PAD model
@@ -3676,6 +3547,7 @@ index 0000000..5bea43b
 +static void __exit imon_exit(void);
 +
 +/*** G L O B A L S ***/
++#define IMON_DATA_BUF_SZ	35
 +
 +struct imon_context {
 +	struct usb_device *usbdev;
@@ -3704,7 +3576,7 @@ index 0000000..5bea43b
 +	} rx;
 +
 +	struct tx_t {
-+		unsigned char data_buf[35];	/* user data buffer */
++		unsigned char data_buf[IMON_DATA_BUF_SZ];	/* user data buffer */
 +		struct completion finished;	/* wait for write to finish */
 +		atomic_t busy;			/* write in progress */
 +		int status;			/* status of tx completion */
@@ -3980,6 +3852,8 @@ index 0000000..5bea43b
 +	struct imon_context *context;
 +	const unsigned char vfd_packet6[] = {
 +		0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF };
++	unsigned char data_buf[IMON_DATA_BUF_SZ];
++	
 +
 +	context = (struct imon_context *)file->private_data;
 +	if (!context) {
@@ -4001,11 +3875,13 @@ index 0000000..5bea43b
 +		goto exit;
 +	}
 +
-+	if (copy_from_user(context->tx.data_buf, buf, n_bytes)) {
++	if (copy_from_user(data_buf, buf, n_bytes)) {
 +		retval = -EFAULT;
 +		goto exit;
 +	}
 +
++	memcpy(context->tx.data_buf, data_buf, n_bytes);
++
 +	/* Pad with spaces */
 +	for (i = n_bytes; i < 32; ++i)
 +		context->tx.data_buf[i] = ' ';
@@ -4655,7 +4531,7 @@ index 0000000..5bea43b
 +module_exit(imon_exit);
 diff --git a/drivers/input/lirc/lirc_it87.c b/drivers/input/lirc/lirc_it87.c
 new file mode 100644
-index 0000000..c69662d
+index 0000000..b253aa3
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_it87.c
 @@ -0,0 +1,991 @@
@@ -4868,7 +4744,7 @@ index 0000000..c69662d
 +{
 +	int i = 0;
 +
-+	if (n % sizeof(int) || (n / sizeof(int)) > WBUF_LEN)
++	if (n % sizeof(int) || (n > sizeof(int)*WBUF_LEN))
 +		return -EINVAL;
 +	if (copy_from_user(tx_buf, buf, n))
 +		return -EFAULT;
@@ -5774,10 +5650,10 @@ index 0000000..cf021c8
 +/********************************* ITE IT87xx ************************/
 diff --git a/drivers/input/lirc/lirc_ite8709.c b/drivers/input/lirc/lirc_ite8709.c
 new file mode 100644
-index 0000000..6210847
+index 0000000..00e31cb
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_ite8709.c
-@@ -0,0 +1,540 @@
+@@ -0,0 +1,542 @@
 +/*
 + * LIRC driver for ITE8709 CIR port
 + *
@@ -6302,15 +6178,17 @@ index 0000000..6210847
 +	.id_table       = pnp_dev_table,
 +};
 +
-+int init_module(void)
++static int __init ite8709_init_module(void)
 +{
 +	return pnp_register_driver(&ite8709_pnp_driver);
 +}
++module_init(ite8709_init_module);
 +
-+void cleanup_module(void)
++static void __exit ite8709_cleanup_module(void)
 +{
 +	pnp_unregister_driver(&ite8709_pnp_driver);
 +}
++module_exit(ite8709_cleanup_module);
 +
 +MODULE_DESCRIPTION("LIRC driver for ITE8709 CIR port");
 +MODULE_AUTHOR("Grégory Lardière");
@@ -6320,7 +6198,7 @@ index 0000000..6210847
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 diff --git a/drivers/input/lirc/lirc_mceusb.c b/drivers/input/lirc/lirc_mceusb.c
 new file mode 100644
-index 0000000..8b404e2
+index 0000000..ea72db9
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb.c
 @@ -0,0 +1,1222 @@
@@ -6945,7 +6823,7 @@ index 0000000..8b404e2
 +	count = n / sizeof(int);
 +
 +	/* Check if command is within limits */
-+	if (count > LIRCBUF_SIZE || count%2 == 0)
++	if (n > (LIRCBUF_SIZE*sizeof(int)) || count%2 == 0)
 +		return -EINVAL;
 +	if (copy_from_user(wbuf, buf, n))
 +		return -EFAULT;
@@ -7317,7 +7195,7 @@ index 0000000..8b404e2
 +	if (lirc_buffer_init(rbuf, sizeof(int), LIRCBUF_SIZE))
 +		goto mem_alloc_fail;
 +
-+	ir->buf_in = usb_buffer_alloc(dev, maxp, GFP_ATOMIC, &ir->dma_in);
++	ir->buf_in = usb_alloc_coherent(dev, maxp, GFP_ATOMIC, &ir->dma_in);
 +	if (!ir->buf_in)
 +		goto buf_in_alloc_fail;
 +
@@ -7448,7 +7326,7 @@ index 0000000..8b404e2
 +lirc_register_fail:
 +	usb_free_urb(ir->urb_in);
 +urb_in_alloc_fail:
-+	usb_buffer_free(dev, maxp, ir->buf_in, ir->dma_in);
++	usb_free_coherent(dev, maxp, ir->buf_in, ir->dma_in);
 +buf_in_alloc_fail:
 +	lirc_buffer_free(rbuf);
 +mem_alloc_fail:
@@ -7477,7 +7355,7 @@ index 0000000..8b404e2
 +	mutex_lock(&ir->dev_lock);
 +	usb_kill_urb(ir->urb_in);
 +	usb_free_urb(ir->urb_in);
-+	usb_buffer_free(dev, ir->len_in, ir->buf_in, ir->dma_in);
++	usb_free_coherent(dev, ir->len_in, ir->buf_in, ir->dma_in);
 +	mutex_unlock(&ir->dev_lock);
 +
 +	unregister_from_lirc(ir);
@@ -8295,10 +8173,10 @@ index 0000000..4bed6af
 +#endif
 diff --git a/drivers/input/lirc/lirc_sasem.c b/drivers/input/lirc/lirc_sasem.c
 new file mode 100644
-index 0000000..4015684
+index 0000000..cf095fa
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_sasem.c
-@@ -0,0 +1,931 @@
+@@ -0,0 +1,935 @@
 +/*
 + * lirc_sasem.c - USB remote support for LIRC
 + * Version 0.5
@@ -8387,6 +8265,7 @@ index 0000000..4015684
 +static void __exit sasem_exit(void);
 +
 +/*** G L O B A L S ***/
++#define SASAM_DATA_BUF_SZ	32
 +
 +struct sasem_context {
 +
@@ -8407,7 +8286,7 @@ index 0000000..4015684
 +	unsigned char usb_tx_buf[8];
 +
 +	struct tx_t {
-+		unsigned char data_buf[32];  /* user data buffer	  */
++		unsigned char data_buf[SASAM_DATA_BUF_SZ];  /* user data buffer	  */
 +		struct completion finished;  /* wait for write to finish  */
 +		atomic_t busy;		     /* write in progress	 */
 +		int status;		     /* status of tx completion   */
@@ -8665,6 +8544,7 @@ index 0000000..4015684
 +	int i;
 +	int retval = 0;
 +	struct sasem_context *context;
++	unsigned char data_buf[SASAM_DATA_BUF_SZ];
 +
 +	context = (struct sasem_context *) file->private_data;
 +	if (!context) {
@@ -8686,10 +8566,12 @@ index 0000000..4015684
 +		goto exit;
 +	}
 +
-+	retval = copy_from_user(context->tx.data_buf, buf, n_bytes);
++	retval = copy_from_user(data_buf, buf, n_bytes);
 +	if (retval < 0)
 +		goto exit;
 +
++	memcpy(context->tx.data_buf, data_buf, n_bytes);
++
 +	/* Pad with spaces */
 +	for (i = n_bytes; i < 32; ++i)
 +		context->tx.data_buf[i] = ' ';
@@ -9232,7 +9114,7 @@ index 0000000..4015684
 +module_exit(sasem_exit);
 diff --git a/drivers/input/lirc/lirc_serial.c b/drivers/input/lirc/lirc_serial.c
 new file mode 100644
-index 0000000..f4fcc37
+index 0000000..101b397
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_serial.c
 @@ -0,0 +1,1317 @@
@@ -10205,7 +10087,7 @@ index 0000000..f4fcc37
 +	if (n % sizeof(int))
 +		return -EINVAL;
 +	count = n / sizeof(int);
-+	if (count > WBUF_LEN || count % 2 == 0)
++	if (n > (WBUF_LEN*sizeof(int)) || count % 2 == 0)
 +		return -EINVAL;
 +	if (copy_from_user(wbuf, buf, n))
 +		return -EFAULT;
@@ -10555,7 +10437,7 @@ index 0000000..f4fcc37
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 diff --git a/drivers/input/lirc/lirc_sir.c b/drivers/input/lirc/lirc_sir.c
 new file mode 100644
-index 0000000..4a471d6
+index 0000000..91075ad
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_sir.c
 @@ -0,0 +1,1283 @@
@@ -10858,7 +10740,7 @@ index 0000000..4a471d6
 +	unsigned long flags;
 +	int i;
 +
-+	if (n % sizeof(int) || (n / sizeof(int)) > WBUF_LEN)
++	if (n % sizeof(int) || (n > WBUF_LEN*sizeof(int)))
 +		return -EINVAL;
 +	if (copy_from_user(tx_buf, buf, n))
 +		return -EFAULT;
@@ -11844,7 +11726,7 @@ index 0000000..4a471d6
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 diff --git a/drivers/input/lirc/lirc_streamzap.c b/drivers/input/lirc/lirc_streamzap.c
 new file mode 100644
-index 0000000..f4374e8
+index 0000000..b7c594f
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_streamzap.c
 @@ -0,0 +1,794 @@
@@ -12344,7 +12226,7 @@ index 0000000..f4374e8
 +	/* Allocate the USB buffer and IRQ URB */
 +
 +	sz->buf_in_len = sz->endpoint->wMaxPacketSize;
-+	sz->buf_in = usb_buffer_alloc(sz->udev, sz->buf_in_len,
++	sz->buf_in = usb_alloc_coherent(sz->udev, sz->buf_in_len,
 +				      GFP_ATOMIC, &sz->dma_in);
 +	if (sz->buf_in == NULL)
 +		goto free_sz;
@@ -12447,7 +12329,7 @@ index 0000000..f4374e8
 +
 +	if (sz) {
 +		usb_free_urb(sz->urb_in);
-+		usb_buffer_free(udev, sz->buf_in_len, sz->buf_in, sz->dma_in);
++		usb_free_coherent(udev, sz->buf_in_len, sz->buf_in, sz->dma_in);
 +		kfree(sz);
 +	}
 +
@@ -12553,7 +12435,7 @@ index 0000000..f4374e8
 +
 +	usb_free_urb(sz->urb_in);
 +
-+	usb_buffer_free(sz->udev, sz->buf_in_len, sz->buf_in, sz->dma_in);
++	usb_free_coherent(sz->udev, sz->buf_in_len, sz->buf_in, sz->dma_in);
 +
 +	minor = sz->driver->minor;
 +	kfree(sz->driver->rbuf);
@@ -14448,10 +14330,10 @@ index 0000000..3a5bc34
 +module_param(disable_tx, bool, 0644);
 +MODULE_PARM_DESC(disable_tx, "Disable the IR transmitter device");
 diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
-index 16ec523..1196110 100644
+index c44b9ea..4da8be7 100644
 --- a/drivers/input/misc/Kconfig
 +++ b/drivers/input/misc/Kconfig
-@@ -319,4 +319,16 @@ config INPUT_PCAP
+@@ -390,4 +390,16 @@ config INPUT_PCAP
  	  To compile this driver as a module, choose M here: the
  	  module will be called pcap_keys.
  
@@ -14469,10 +14351,10 @@ index 16ec523..1196110 100644
 +
  endif
 diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
-index a8b8485..79358ff 100644
+index 71fe57d..4a7b7fa 100644
 --- a/drivers/input/misc/Makefile
 +++ b/drivers/input/misc/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_INPUT_CM109)		+= cm109.o
+@@ -17,6 +17,7 @@ obj-$(CONFIG_INPUT_CM109)		+= cm109.o
  obj-$(CONFIG_INPUT_COBALT_BTNS)		+= cobalt_btns.o
  obj-$(CONFIG_INPUT_DM355EVM)		+= dm355evm_keys.o
  obj-$(CONFIG_HP_SDC_RTC)		+= hp_sdc_rtc.o
@@ -16916,3 +16798,103 @@ index 0000000..71223e2
 +
 +module_init(imon_init);
 +module_exit(imon_exit);
+diff --git a/include/linux/lirc.h b/include/linux/lirc.h
+new file mode 100644
+index 0000000..8ae64fa
+--- /dev/null
++++ b/include/linux/lirc.h
+@@ -0,0 +1,94 @@
++/*
++ * lirc.h - linux infrared remote control header file
++ * last modified 2007/09/27
++ */
++
++#ifndef _LINUX_LIRC_H
++#define _LINUX_LIRC_H
++
++#include <linux/types.h>
++#include <linux/ioctl.h>
++
++#define PULSE_BIT  0x01000000
++#define PULSE_MASK 0x00FFFFFF
++
++/*** lirc compatible hardware features ***/
++
++#define LIRC_MODE2SEND(x) (x)
++#define LIRC_SEND2MODE(x) (x)
++#define LIRC_MODE2REC(x) ((x) << 16)
++#define LIRC_REC2MODE(x) ((x) >> 16)
++
++#define LIRC_MODE_RAW                  0x00000001
++#define LIRC_MODE_PULSE                0x00000002
++#define LIRC_MODE_MODE2                0x00000004
++#define LIRC_MODE_LIRCCODE             0x00000010
++
++
++#define LIRC_CAN_SEND_RAW              LIRC_MODE2SEND(LIRC_MODE_RAW)
++#define LIRC_CAN_SEND_PULSE            LIRC_MODE2SEND(LIRC_MODE_PULSE)
++#define LIRC_CAN_SEND_MODE2            LIRC_MODE2SEND(LIRC_MODE_MODE2)
++#define LIRC_CAN_SEND_LIRCCODE         LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
++
++#define LIRC_CAN_SEND_MASK             0x0000003f
++
++#define LIRC_CAN_SET_SEND_CARRIER      0x00000100
++#define LIRC_CAN_SET_SEND_DUTY_CYCLE   0x00000200
++#define LIRC_CAN_SET_TRANSMITTER_MASK  0x00000400
++
++#define LIRC_CAN_REC_RAW               LIRC_MODE2REC(LIRC_MODE_RAW)
++#define LIRC_CAN_REC_PULSE             LIRC_MODE2REC(LIRC_MODE_PULSE)
++#define LIRC_CAN_REC_MODE2             LIRC_MODE2REC(LIRC_MODE_MODE2)
++#define LIRC_CAN_REC_LIRCCODE          LIRC_MODE2REC(LIRC_MODE_LIRCCODE)
++
++#define LIRC_CAN_REC_MASK              LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
++
++#define LIRC_CAN_SET_REC_CARRIER       (LIRC_CAN_SET_SEND_CARRIER << 16)
++#define LIRC_CAN_SET_REC_DUTY_CYCLE    (LIRC_CAN_SET_SEND_DUTY_CYCLE << 16)
++
++#define LIRC_CAN_SET_REC_DUTY_CYCLE_RANGE 0x40000000
++#define LIRC_CAN_SET_REC_CARRIER_RANGE    0x80000000
++#define LIRC_CAN_GET_REC_RESOLUTION       0x20000000
++
++#define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK)
++#define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK)
++
++#define LIRC_CAN_NOTIFY_DECODE            0x01000000
++
++/*** IOCTL commands for lirc driver ***/
++
++#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, uint64_t)
++
++#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, uint64_t)
++#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, uint64_t)
++#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, uint32_t)
++#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, uint32_t)
++#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, uint32_t)
++#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, uint32_t)
++#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, uint32_t)
++
++/* code length in bits, currently only for LIRC_MODE_LIRCCODE */
++#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, uint64_t)
++
++#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, uint64_t)
++#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, uint64_t)
++/* Note: these can reset the according pulse_width */
++#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, uint32_t)
++#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, uint32_t)
++#define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, uint32_t)
++#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, uint32_t)
++#define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, uint32_t)
++
++/*
++ * to set a range use
++ * LIRC_SET_REC_DUTY_CYCLE_RANGE/LIRC_SET_REC_CARRIER_RANGE with the
++ * lower bound first and later
++ * LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound
++ */
++
++#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, uint32_t)
++#define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, uint32_t)
++
++#define LIRC_NOTIFY_DECODE             _IO('i', 0x00000020)
++
++#endif


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1157
retrieving revision 1.1158
diff -u -p -r1.1157 -r1.1158
--- sources	16 May 2010 22:09:00 -0000	1.1157
+++ sources	22 Jun 2010 16:02:02 -0000	1.1158
@@ -1 +1,2 @@
 10eebcb0178fb4540e2165bfd7efc7ad  linux-2.6.34.tar.bz2
+fd4e7c247199c9178ef4a9c7dc52dd3c  patch-2.6.35-rc3.bz2


--- add-appleir-usb-driver.patch DELETED ---


--- btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch DELETED ---


--- btrfs-should-add-permission-check-for-setfacl.patch DELETED ---


--- coredump-uid-pipe-check.patch DELETED ---


--- crypto-add-async-hash-testing.patch DELETED ---


--- drm-next.patch DELETED ---


--- iwlwifi-Recover-TX-flow-failure.patch DELETED ---


--- iwlwifi-Recover-TX-flow-stall-due-to-stuck-queue.patch DELETED ---


--- iwlwifi-add-internal-short-scan-support-for-3945.patch DELETED ---


--- iwlwifi-code-cleanup-for-connectivity-recovery.patch DELETED ---


--- iwlwifi-fix-internal-scan-race.patch DELETED ---


--- iwlwifi-iwl_good_ack_health-only-apply-to-AGN-device.patch DELETED ---


--- iwlwifi-manage-QoS-by-mac-stack.patch DELETED ---


--- iwlwifi-move-plcp-check-to-separated-function.patch DELETED ---


--- iwlwifi-recalculate-average-tpt-if-not-current.patch DELETED ---


--- iwlwifi-recover_from_tx_stall.patch DELETED ---


--- linux-2.6-acpi-sleep-live-sci-live.patch DELETED ---


--- linux-2.6-acpi-video-export-edid.patch DELETED ---


--- linux-2.6-input-hid-quirk-egalax.patch DELETED ---


--- linux-2.6-tracehook.patch DELETED ---


--- linux-2.6-umh-refactor.patch DELETED ---


--- linux-2.6-usb-wwan-update.patch DELETED ---


--- linux-2.6-utrace-ptrace.patch DELETED ---


--- linux-2.6-utrace.patch DELETED ---


--- linux-2.6-v4l-dvb-gspca-fixes.patch DELETED ---


--- linux-2.6-x86-cfi_sections.patch DELETED ---


--- mac80211-do-not-wipe-out-old-supported-rates.patch DELETED ---


--- mac80211-explicitly-disable-enable-QoS.patch DELETED ---


--- pci-hush-rom-warning.patch DELETED ---


--- quiet-prove_RCU-in-cgroups.patch DELETED ---


--- thinkpad-acpi-add-x100e.patch DELETED ---


--- virt_console-rollup.patch DELETED ---


--- virtqueue-wrappers.patch DELETED ---

