[kernel/f16] Rebase to 3.2.1
Dave Jones
davej at fedoraproject.org
Fri Jan 20 02:30:53 UTC 2012
commit 1045154ecffe73ae898099f24ffab89f5ff62a70
Author: Dave Jones <davej at redhat.com>
Date: Thu Jan 19 21:29:56 2012 -0500
Rebase to 3.2.1
.gitignore | 1 +
...imit-direct-reclaim-for-higher-order-allo.patch | 54 -
...SCSI-passthrough-ioctls-on-partition-devs.patch | 165 --
Bluetooth-Add-support-for-BCM20702A0.patch | 15 -
HID-wacom-Set-input-bits-before-registration.patch | 131 --
Makefile | 177 +--
Makefile.config | 11 +-
add-appleir-usb-driver.patch | 701 -------
alps.patch | 243 +--
asus-laptop-3.2-backport.patch | 592 ------
b44-Use-dev_kfree_skb_irq-in-b44_tx.patch | 62 -
...member-vlan-pkts-not-received-in-promisco.patch | 63 -
cciss-fix-irqf-shared.patch | 39 -
compat-wireless-config-fixups.patch | 40 +-
compat-wireless-pr_fmt-warning-avoidance.patch | 216 ++-
...s-rtl8192cu-Fix-WARNING-on-suspend-resume.patch | 48 +-
config-arm-generic | 29 +-
config-arm-highbank | 13 +
config-arm-imx | 3 +
config-arm-kirkwood | 2 +-
config-arm-omap-generic | 64 +-
config-arm-tegra | 7 +
config-backports | 5 +
config-debug | 5 +-
config-generic | 996 +++++-----
config-ia64-generic | 204 --
config-nodebug | 5 +-
config-powerpc-generic | 75 +-
config-powerpc32-generic | 64 +-
config-powerpc64 | 67 +-
config-s390x | 2 +
config-sparc64-generic | 1 +
config-x86-32-generic | 9 +-
config-x86-generic | 17 +-
config-x86_64-generic | 15 +-
drm-i915-sdvo-lvds-is-digital.patch | 83 -
drm-lower-severity-radeon-lockup.diff | 13 -
elantech.patch | 2180 --------------------
epoll-limit-paths.patch | 8 +-
hvcs_pi_buf_alloc.patch | 43 -
kernel.spec | 162 +--
linux-2.6-32bit-mmap-exec-randomization.patch | 27 +-
linux-2.6-debug-taint-vm.patch | 51 -
linux-2.6-e1000-ich9-montevina.patch | 28 +-
linux-2.6-i386-nx-emulation.patch | 22 -
linux-2.6-intel-iommu-igfx.patch | 35 +-
...revent-information-leak-after-failed-read.patch | 41 -
media-dib0700-correct-error-message.patch | 103 -
net-sky2-88e8059-fix-link-speed.patch | 42 -
nfs-client-freezer.patch | 112 +-
rcu-avoid-just-onlined-cpu-resched.patch | 47 -
rcutree-avoid-false-quiescent-states.patch | 67 -
rtl8192cu-Fix-WARNING-on-suspend-resume.patch | 54 +-
samsung-laptop-brightness-fixes-3.2.patch | 238 ---
sources | 4 +-
udlfb-bind-framebuffer-to-interface.patch | 33 -
utrace.patch | 1652 +++++++---------
x86-code-dump-fix-truncation.patch | 73 -
58 files changed, 1749 insertions(+), 7510 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index edb6bec..a23ef2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
clog
+*.xz
*.bz2
*.rpm
*.orig
diff --git a/Makefile b/Makefile
index 3e9e3a8..5b7b724 100644
--- a/Makefile
+++ b/Makefile
@@ -17,15 +17,16 @@ help:
include Makefile.config
-ifndef KVERSION
-KVERSION := $(shell awk '$$1 == "%define" && $$2 == "base_sublevel" { \
- print "2.6." $$3 \
- }' $(SPECFILE))
-endif
-
prep:
fedpkg -v prep --arch=$(PREPARCH)
+noarch:
+ fedpkg -v local --arch=noarch
+
+# 'make local' also needs to build the noarch firmware package
+local: noarch
+ fedpkg -v local
+
extremedebug:
@perl -pi -e 's/# CONFIG_DEBUG_PAGEALLOC is not set/CONFIG_DEBUG_PAGEALLOC=y/' config-nodebug
@@ -46,6 +47,7 @@ debug:
@perl -pi -e 's/# CONFIG_FAIL_PAGE_ALLOC is not set/CONFIG_FAIL_PAGE_ALLOC=y/' config-nodebug
@perl -pi -e 's/# CONFIG_FAIL_IO_TIMEOUT is not set/CONFIG_FAIL_IO_TIMEOUT=y/' config-nodebug
@perl -pi -e 's/# CONFIG_FAIL_MAKE_REQUEST is not set/CONFIG_FAIL_MAKE_REQUEST=y/' config-nodebug
+ @perl -pi -e 's/# CONFIG_FAIL_MMC_REQUEST is not set/CONFIG_FAIL_MMC_REQUEST=y/' config-nodebug
@perl -pi -e 's/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/CONFIG_FAULT_INJECTION_DEBUG_FS=y/' config-nodebug
@perl -pi -e 's/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/' config-nodebug
@perl -pi -e 's/# CONFIG_DEBUG_SG is not set/CONFIG_DEBUG_SG=y/' config-nodebug
@@ -79,7 +81,6 @@ debug:
@perl -pi -e 's/# CONFIG_ATH_DEBUG is not set/CONFIG_ATH_DEBUG=y/' config-nodebug
@perl -pi -e 's/# CONFIG_CARL9170_DEBUGFS is not set/CONFIG_CARL9170_DEBUGFS=y/' config-nodebug
@perl -pi -e 's/# CONFIG_IWLWIFI_DEVICE_TRACING is not set/CONFIG_IWLWIFI_DEVICE_TRACING=y/' config-nodebug
- @perl -pi -e 's/# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set/CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y/' config-nodebug
@perl -pi -e 's/# CONFIG_DMADEVICES_DEBUG is not set/CONFIG_DMADEVICES_DEBUG=y/' config-nodebug
@perl -pi -e 's/# CONFIG_DMADEVICES_VDEBUG is not set/CONFIG_DMADEVICES_VDEBUG=y/' config-nodebug
@perl -pi -e 's/# CONFIG_CEPH_LIB_PRETTYDEBUG is not set/CONFIG_CEPH_LIB_PRETTYDEBUG=y/' config-nodebug
@@ -91,21 +92,21 @@ debug:
@perl -pi -e 's/# CONFIG_TEST_LIST_SORT is not set/CONFIG_TEST_LIST_SORT=y/' config-nodebug
@perl -pi -e 's/# CONFIG_DEBUG_ATOMIC_SLEEP is not set/CONFIG_DEBUG_ATOMIC_SLEEP=y/' config-nodebug
@perl -pi -e 's/# CONFIG_DETECT_HUNG_TASK is not set/CONFIG_DETECT_HUNG_TASK=y/' config-nodebug
-
- @perl -pi -e 's/# CONFIG_DEBUG_SET_MODULE_RONX is not set/CONFIG_DEBUG_SET_MODULE_RONX=y/' config-nodebug
+ @perl -pi -e 's/# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y/' config-nodebug
+ @perl -pi -e 's/# CONFIG_DEBUG_KMEMLEAK is not set/CONFIG_DEBUG_KMEMLEAK=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
- @perl -pi -e 's/CONFIG_NR_CPUS=256/CONFIG_NR_CPUS=512/' config-x86_64-generic
+ @perl -pi -e 's/# CONFIG_MAXSMP is not set/CONFIG_MAXSMP=y/' config-x86-generic
+
+ # Try out UAS in rawhide builds.
+ @perl -pi -e 's/# CONFIG_USB_UAS is not set/CONFIG_USB_UAS=m/' config-generic
@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
@perl -pi -e 's/^%define rawhide_skip_docs 0/%define rawhide_skip_docs 1/' kernel.spec
+ @rpmdev-bumpspec -c "Reenable debugging options." kernel.spec
-nodebuginfo:
- @perl -pi -e 's/^%define with_debuginfo %\{\?_without_debuginfo: 0\} %\{\?\!_without_debuginfo: 1\}/%define with_debuginfo %\{\?_without_debuginfo: 0\} %\{\?\!_without_debuginfo: 0\}/' kernel.spec
-nodebug: release
- @perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
release:
@perl -pi -e 's/CONFIG_SLUB_DEBUG_ON=y/# CONFIG_SLUB_DEBUG_ON is not set/' config-nodebug
@perl -pi -e 's/CONFIG_LOCK_STAT=y/# CONFIG_LOCK_STAT is not set/' config-nodebug
@@ -123,6 +124,7 @@ release:
@perl -pi -e 's/CONFIG_FAIL_PAGE_ALLOC=y/# CONFIG_FAIL_PAGE_ALLOC is not set/' config-nodebug
@perl -pi -e 's/CONFIG_FAIL_IO_TIMEOUT=y/# CONFIG_FAIL_IO_TIMEOUT is not set/' config-nodebug
@perl -pi -e 's/CONFIG_FAIL_MAKE_REQUEST=y/# CONFIG_FAIL_MAKE_REQUEST is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_FAIL_MMC_REQUEST=y/# CONFIG_FAIL_MMC_REQUEST is not set/' config-nodebug
@perl -pi -e 's/CONFIG_FAULT_INJECTION_DEBUG_FS=y/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/' config-nodebug
@perl -pi -e 's/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DEBUG_SG=y/# CONFIG_DEBUG_SG is not set/' config-nodebug
@@ -156,7 +158,6 @@ release:
@perl -pi -e 's/CONFIG_ATH_DEBUG=y/# CONFIG_ATH_DEBUG is not set/' config-nodebug
@perl -pi -e 's/CONFIG_CARL9170_DEBUGFS=y/# CONFIG_CARL9170_DEBUGFS is not set/' config-nodebug
@perl -pi -e 's/CONFIG_IWLWIFI_DEVICE_TRACING=y/# CONFIG_IWLWIFI_DEVICE_TRACING is not set/' config-nodebug
- @perl -pi -e 's/CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y/# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DMADEVICES_DEBUG=y/# CONFIG_DMADEVICES_DEBUG is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DMADEVICES_VDEBUG=y/# CONFIG_DMADEVICES_VDEBUG is not set/' config-nodebug
@perl -pi -e 's/CONFIG_CEPH_LIB_PRETTYDEBUG=y/# CONFIG_CEPH_LIB_PRETTYDEBUG is not set/' config-nodebug
@@ -168,144 +169,36 @@ release:
@perl -pi -e 's/CONFIG_TEST_LIST_SORT=y/# CONFIG_TEST_LIST_SORT is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DEBUG_ATOMIC_SLEEP=y/# CONFIG_DEBUG_ATOMIC_SLEEP is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DETECT_HUNG_TASK=y/# CONFIG_DETECT_HUNG_TASK is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y/# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_DEBUG_KMEMLEAK=y/# CONFIG_DEBUG_KMEMLEAK is not set/' config-nodebug
- @perl -pi -e 's/CONFIG_DEBUG_SET_MODULE_RONX=y/# CONFIG_DEBUG_SET_MODULE_RONX is not set/' config-nodebug
-
+ # Undo anything that make extremedebug might have set
@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
- @perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=256/' config-x86_64-generic
+ # Change defaults back to sane things.
+ @perl -pi -e 's/CONFIG_MAXSMP=y/# CONFIG_MAXSMP is not set/' config-x86-generic
+
+ # Disable UAS for release until it's ready. (#717633, #744099)
+ @perl -pi -e 's/CONFIG_USB_UAS=m/# CONFIG_USB_UAS is not set/' config-generic
@perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel.spec
@perl -pi -e 's/^%define rawhide_skip_docs 1/%define rawhide_skip_docs 0/' kernel.spec
+ @rpmdev-bumpspec -c "Disable debugging options." kernel.spec
-reconfig:
- @rm -f kernel-*-config
- @VERSION=$(KVERSION) make -f Makefile.config configs
- @scripts/reconfig.sh
+nodebuginfo:
+ @perl -pi -e 's/^%define with_debuginfo %\{\?_without_debuginfo: 0\} %\{\?\!_without_debuginfo: 1\}/%define with_debuginfo %\{\?_without_debuginfo: 0\} %\{\?\!_without_debuginfo: 0\}/' kernel.spec
+nodebug: release
+ @perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
unused-kernel-patches:
@for f in *.patch; do if [ -e $$f ]; then (egrep -q "^Patch[[:digit:]]+:[[:space:]]+$$f" $(SPECFILE) || echo "Unused: $$f") && egrep -q "^ApplyPatch[[:space:]]+$$f|^ApplyOptionalPatch[[:space:]]+$$f" $(SPECFILE) || echo "Unapplied: $$f"; fi; done
-# since i386 isn't a target...
-compile compile-short: DIST_DEFINES += --target $(shell uname -m)
-
-# 'make local' also needs to build the noarch firmware package
-local: noarch
-
-#
-# Hacks for building vanilla (unpatched) kernel rpms.
-# Use "make vanilla-TARGET" like "make TARGET" (make vanilla-scratch-build).
-#
-vanilla-%: $(SPECFILE:.spec=-vanilla.spec)
- @$(MAKE) $* SPECFILE=$<
-
-$(SPECFILE:.spec=-vanilla.spec): $(SPECFILE)
- @rm -f $@
- (echo %define nopatches 1; cat $<) > $@
-
-#scratch-build: NAME = $(shell rpm $(RPM_DEFINES) $(DIST_DEFINES) -q --qf "%{NAME}\n" --specfile $(SPECFILE)| head -1)
-#scratch-build: test-srpm
-# $(BUILD_CLIENT) build $(BUILD_FLAGS) --scratch $(TARGET) \
-# $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).src.rpm
-
-# Dismal kludge for building via brew from cvs after "make vanilla-tag".
-ifdef BEEHIVE_SRPM_BUILD
-export CHECKOUT_TAG ?= $(shell sed s/^.// CVS/Tag)
-tag-pattern = $(TAG_NAME)-$(TAG_VERSION)-0_%_$(TAG_RELEASE)
-ifeq (,$(filter-out $(tag-pattern),$(CHECKOUT_TAG)))
-variant := $(patsubst $(tag-pattern),%,$(CHECKOUT_TAG))
-srpm: SPECFILE := $(wildcard $(SPECFILE:.spec=-$(variant).spec) \
- $(SPECFILE:.spec=.t.$(variant).spec))
-srpm beehive-sprm: RELEASE := 0.$(variant).$(RELEASE)
-endif
-endif
-
-#
-# Hacks for building kernel rpms from upstream code plus local GIT branches.
-# Use "make git/BRANCH/TARGET" like "make TARGET".
-# Use "make git/BRANCH-fedora/TARGET" to include Fedora patches on top.
-#
-ifndef GIT_SPEC
-git/%:
- @$(MAKE) GIT_SPEC=$(subst /,-,$(*D)) git-$(*F)
-else
-git-%: $(SPECFILE:.spec=.t.$(GIT_SPEC).spec)
- @$(MAKE) GIT_SPEC= $* SPECFILE=$<
-endif
+ifeq ($(MAKECMDGOALS),me a sandwich)
+.PHONY: me a sandwich
+me a:
+ @:
-#
-# Your git-branches.mk file can define GIT_DIR, e.g.:
-# GIT_DIR = ${HOME}/kernel/.git
-# Make sure GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL are also set
-# or your rpm changelogs will look like crap.
-#
-# For each branch it can define a variable branch-BRANCH or tag-BRANCH
-# giving the parent of BRANCH to diff against in a separate patch. If
-# the parent is unknown, it will use $(branch-upstream) defaulting to
-# "refs/remotes/upstream/master".
-#
-# Defining tag-BRANCH means the tag corresponds to an upstream patch in
-# the sources file, so that is used instead of generating a patch with
-# git. If there is no tag-upstream defined, it will figure out a vNNN
-# tag or vNNN-gitN pseudo-tag from the last patch in the sources file.
-# For example:
-# tag-some-hacks = v2.6.21-rc5
-# branch-more-hacks = some-hacks
-# Leads to patches:
-# git diff v2.6.21-rc5..more-hacks > linux-2.6.21-rc5-some-hacks.patch
-# git diff some-hacks..more-hacks > linux-2.6.21-rc5-more-hacks.patch
-# Whereas having no git-branches.mk at all but doing
-# "make GIT_DIR=... git/mybranch/test-srpm" does:
-# id=`cat patch-2.6.21-rc5-git4.id` # auto-fetched via upstream file
-# git diff $id..upstream > linux-2.6.21-rc5-git4-upstream.patch
-# git diff upstream..mybranch > linux-2.6.21-rc5-git4-mybranch.patch
-# If the upstream patch (or any branch patch) is empty it's left out.
-#
-git-branches.mk:;
--include git-branches.mk
-
-branch-upstream ?= refs/remotes/upstream/master
-
-ifdef GIT_DIR
-export GIT_DIR
-export GIT_AUTHOR_NAME
-export GIT_AUTHOR_EMAIL
-gen-patches ?= gen-patches
-
-ifndef havespec
-$(SPECFILE:.spec=.t.%-fedora.spec): $(SPECFILE) $(gen-patches) FORCE
- ./$(gen-patches) --fedora < $< > $@ $(gen-patches-args)
-$(SPECFILE:.spec=.t.%.spec): $(SPECFILE) $(gen-patches) FORCE
- ./$(gen-patches) < $< > $@ $(gen-patches-args)
-.PRECIOUS: $(SPECFILE:.spec=.t.%.spec) $(SPECFILE:.spec=.t.%-fedora.spec)
-endif
-
-spec-%: $(SPECFILE:.spec=.t.%.spec) ;
-$(SPECFILE):;
-FORCE:;
-
-branch-of-* = $(firstword $(head-$*) $*)
-gen-patches-args = --name $* v$(KVERSION) $(call heads,$(branch-of-*))
-define heads
-$(if $(tag-$1),$(filter-out v$(KVERSION),$(tag-$1)),\
- $(call heads,$(firstword $(branch-$1) $(branch-upstream)))) $1
-endef
-
-files-%-fedora:
- @echo $(SPECFILE:.spec=.t.$*-fedora.spec)
- @$(call list-patches,$(branch-of-*))
-files-%:
- @echo $(SPECFILE:.spec=.t.$*.spec)
- @$(call list-patches,$(branch-of-*))
-define list-patches
-$(if $(tag-$1),version=$(patsubst v%,%,$(tag-$1)),\
- $(call list-patches,$(firstword $(branch-$1) $(branch-upstream)))); \
-echo linux-$${version}-$(patsubst refs/remotes/%/master,%,$1).patch
-endef
-
-ifndef tag-$(branch-upstream)
-tag-$(branch-upstream) := $(shell \
- sed -n 's/^.* *//;s/\.bz2$$//;s/patch-/v/;/^v/h;$${g;p}' sources)
-endif
+sandwich:
+ @[ `id -u` -ne 0 ] && echo "What? Make it yourself." || echo Okay.
endif
diff --git a/Makefile.config b/Makefile.config
index 223c793..331aa46 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -16,10 +16,9 @@ CONFIGFILES = \
$(CFG)-armv7hl-omap.config $(CFG)-armv7hl-tegra.config \
$(CFG)-ppc.config $(CFG)-ppc-smp.config \
$(CFG)-sparc64.config \
- $(CFG)-ppc64.config $(CFG)-ppc64-debug.config \
- $(CFG)-ia64.config
+ $(CFG)-ppc64.config $(CFG)-ppc64-debug.config
-PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64
+PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390x sparc64
TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
configs: $(CONFIGFILES)
@@ -88,9 +87,6 @@ temp-powerpc32-generic: config-powerpc32-generic temp-powerpc-generic
temp-s390-generic: config-s390x temp-generic
perl merge.pl $^ > $@
-temp-ia64-generic: config-ia64-generic temp-generic
- perl merge.pl $^ > $@
-
kernel-$(VERSION)-i686-PAE.config: config-i686-PAE temp-x86-32-generic
perl merge.pl $^ i386 > $@
@@ -159,6 +155,3 @@ kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic
kernel-$(VERSION)-ppc-smp.config: config-powerpc32-smp temp-powerpc32-generic
perl merge.pl $^ powerpc > $@
-
-kernel-$(VERSION)-ia64.config: /dev/null temp-ia64-generic
- perl merge.pl $^ ia64 > $@
diff --git a/alps.patch b/alps.patch
index e76dc54..331716d 100644
--- a/alps.patch
+++ b/alps.patch
@@ -1,7 +1,7 @@
-From ed11aa781242216bc72f1cd7d757a4f40be10329 Mon Sep 17 00:00:00 2001
+From d4b347b29b4d14647c7394f7167bf6785dc98e50 Mon Sep 17 00:00:00 2001
From: Seth Forshee <seth.forshee at canonical.com>
Date: Mon, 7 Nov 2011 19:53:15 -0800
-Subject: [PATCH 1/7] Input: ALPS - move protocol information to Documentation
+Subject: [PATCH 1/6] Input: ALPS - move protocol information to Documentation
In preparation for new protocol support, move the protocol
information currently documented in alps.c to
@@ -99,10 +99,10 @@ index 0000000..ab5478f
+ byte 7: 0 y6 y5 y4 y3 y2 y1 y0
+ byte 8: 0 z6 z5 z4 z3 z2 z1 z0
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
-index 99d5876..ad15e7c 100644
+index 003587c..19d0943 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
-@@ -74,42 +74,7 @@ static const struct alps_model_info alps_model_data[] = {
+@@ -67,42 +67,7 @@ static const struct alps_model_info alps_model_data[] = {
* isn't valid per PS/2 spec.
*/
@@ -150,10 +150,10 @@ index 99d5876..ad15e7c 100644
1.7.7.3
-From 27b8ed51ee660e9a59cf325d6339f38b216fbb31 Mon Sep 17 00:00:00 2001
+From fa629ef5222193214da9a2b3c94369f79353bec9 Mon Sep 17 00:00:00 2001
From: Seth Forshee <seth.forshee at canonical.com>
Date: Mon, 7 Nov 2011 19:53:24 -0800
-Subject: [PATCH 2/7] Input: ALPS - add protocol version field in
+Subject: [PATCH 2/6] Input: ALPS - add protocol version field in
alps_model_info
In preparation for adding support for more ALPS protocol versions,
@@ -164,28 +164,24 @@ version 1 and version 2, repsectively.
Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
Acked-by: Chase Douglas <chase.douglas at canonical.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
-
-Conflicts:
-
- drivers/input/mouse/alps.c
---
drivers/input/mouse/alps.c | 47 +++++++++++++++++++++----------------------
drivers/input/mouse/alps.h | 4 +++
2 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
-index ad15e7c..572cb21 100644
+index 19d0943..77b776d 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
-@@ -30,7 +30,6 @@
- #define dbg(format, arg...) do {} while (0)
- #endif
+@@ -23,7 +23,6 @@
+ #include "psmouse.h"
+ #include "alps.h"
-#define ALPS_OLDPROTO 0x01 /* old style input */
#define ALPS_DUALPOINT 0x02 /* touchpad has trackstick */
#define ALPS_PASS 0x04 /* device has a pass-through port */
-@@ -42,30 +41,30 @@
+@@ -35,30 +34,30 @@
6-byte ALPS packet */
static const struct alps_model_info alps_model_data[] = {
@@ -238,7 +234,7 @@ index ad15e7c..572cb21 100644
};
/*
-@@ -119,7 +118,7 @@ static void alps_process_packet(struct psmouse *psmouse)
+@@ -112,7 +111,7 @@ static void alps_process_packet(struct psmouse *psmouse)
int x, y, z, ges, fin, left, right, middle;
int back = 0, forward = 0;
@@ -268,10 +264,10 @@ index 904ed8b..4ce9bba 100644
1.7.7.3
-From dfab9d3e073f2a58e4ba3837a726e9a0e33ea5df Mon Sep 17 00:00:00 2001
+From b46615fe9215214ac00e26d35fc54dbe1c510803 Mon Sep 17 00:00:00 2001
From: Seth Forshee <seth.forshee at canonical.com>
Date: Mon, 7 Nov 2011 19:53:30 -0800
-Subject: [PATCH 3/7] Input: ALPS - remove assumptions about packet size
+Subject: [PATCH 3/6] Input: ALPS - remove assumptions about packet size
In preparation for version 4 protocol support, which has 8-byte
data packets, remove all hard-coded assumptions about packet size
@@ -285,10 +281,10 @@ Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
-index 572cb21..f699698 100644
+index 77b776d..44a0a71 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
-@@ -315,7 +315,7 @@ static void alps_flush_packet(unsigned long data)
+@@ -308,7 +308,7 @@ static void alps_flush_packet(unsigned long data)
serio_pause_rx(psmouse->ps2dev.serio);
@@ -297,7 +293,7 @@ index 572cb21..f699698 100644
/*
* We did not any more data in reasonable amount of time.
-@@ -365,15 +365,15 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)
+@@ -359,8 +359,8 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)
return PSMOUSE_BAD_DATA;
}
@@ -306,8 +302,9 @@ index 572cb21..f699698 100644
+ /* Bytes 2 - pktsize should have 0 in the highest bit */
+ if (psmouse->pktcnt >= 2 && psmouse->pktcnt <= psmouse->pktsize &&
(psmouse->packet[psmouse->pktcnt - 1] & 0x80)) {
- dbg("refusing packet[%i] = %x\n",
- psmouse->pktcnt - 1, psmouse->packet[psmouse->pktcnt - 1]);
+ psmouse_dbg(psmouse, "refusing packet[%i] = %x\n",
+ psmouse->pktcnt - 1,
+@@ -368,7 +368,7 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)
return PSMOUSE_BAD_DATA;
}
@@ -316,7 +313,7 @@ index 572cb21..f699698 100644
alps_process_packet(psmouse);
return PSMOUSE_FULL_PACKET;
}
-@@ -531,7 +531,7 @@ static int alps_tap_mode(struct psmouse *psmouse, int enable)
+@@ -529,7 +529,7 @@ static int alps_tap_mode(struct psmouse *psmouse, int enable)
static int alps_poll(struct psmouse *psmouse)
{
struct alps_data *priv = psmouse->private;
@@ -329,10 +326,10 @@ index 572cb21..f699698 100644
1.7.7.3
-From 35f17ba201d7a8b8adc59811effafe62a331fd9e Mon Sep 17 00:00:00 2001
+From 25bded7cd60fa460e520e9f819bd06f4c5cb53f0 Mon Sep 17 00:00:00 2001
From: Seth Forshee <seth.forshee at canonical.com>
Date: Mon, 7 Nov 2011 19:53:36 -0800
-Subject: [PATCH 4/7] Input: ALPS - add support for protocol versions 3 and 4
+Subject: [PATCH 4/6] Input: ALPS - add support for protocol versions 3 and 4
This patch adds support for two ALPS touchpad protocols not
supported currently by the driver, which I am arbitrarily naming
@@ -345,23 +342,19 @@ of the v3 protocol.
Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
Acked-by: Chase Douglas <chase.douglas at canonical.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
-
-Conflicts:
-
- drivers/input/mouse/alps.c
---
- drivers/input/mouse/alps.c | 790 +++++++++++++++++++++++++++++++++++++++--
+ drivers/input/mouse/alps.c | 791 +++++++++++++++++++++++++++++++++++++++--
drivers/input/mouse/alps.h | 14 +
drivers/input/mouse/psmouse.h | 1 +
- 3 files changed, 767 insertions(+), 38 deletions(-)
+ 3 files changed, 768 insertions(+), 38 deletions(-)
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
-index f699698..b2bc8ca 100644
+index 44a0a71..a0248fd 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
-@@ -30,6 +30,49 @@
- #define dbg(format, arg...) do {} while (0)
- #endif
+@@ -23,6 +23,50 @@
+ #include "psmouse.h"
+ #include "alps.h"
+/*
+ * Definitions for ALPS version 3 and 4 command mode protocol
@@ -406,10 +399,11 @@ index f699698..b2bc8ca 100644
+ { PSMOUSE_CMD_SETSCALE11, 0x00 }, /* f */
+};
+
++
#define ALPS_DUALPOINT 0x02 /* touchpad has trackstick */
#define ALPS_PASS 0x04 /* device has a pass-through port */
-@@ -41,30 +84,33 @@
+@@ -34,30 +78,33 @@
6-byte ALPS packet */
static const struct alps_model_info alps_model_data[] = {
@@ -465,7 +459,7 @@ index f699698..b2bc8ca 100644
};
/*
-@@ -108,7 +154,7 @@ static void alps_report_buttons(struct psmouse *psmouse,
+@@ -101,7 +148,7 @@ static void alps_report_buttons(struct psmouse *psmouse,
input_sync(dev2);
}
@@ -474,7 +468,7 @@ index f699698..b2bc8ca 100644
{
struct alps_data *priv = psmouse->private;
const struct alps_model_info *model = priv->i;
-@@ -210,6 +256,224 @@ static void alps_process_packet(struct psmouse *psmouse)
+@@ -203,6 +250,224 @@ static void alps_process_packet(struct psmouse *psmouse)
input_sync(dev);
}
@@ -699,7 +693,7 @@ index f699698..b2bc8ca 100644
static void alps_report_bare_ps2_packet(struct psmouse *psmouse,
unsigned char packet[],
bool report_buttons)
-@@ -381,11 +645,127 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)
+@@ -376,11 +641,127 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)
return PSMOUSE_GOOD_DATA;
}
@@ -827,7 +821,7 @@ index f699698..b2bc8ca 100644
int i;
/*
-@@ -431,12 +811,41 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int
+@@ -428,12 +809,41 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int
*version = (param[0] << 8) | (param[1] << 4) | i;
}
@@ -873,7 +867,7 @@ index f699698..b2bc8ca 100644
}
/*
-@@ -444,7 +853,7 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int
+@@ -441,7 +851,7 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int
* subsequent commands. It looks like glidepad is behind stickpointer,
* I'd thought it would be other way around...
*/
@@ -882,7 +876,7 @@ index f699698..b2bc8ca 100644
{
struct ps2dev *ps2dev = &psmouse->ps2dev;
int cmd = enable ? PSMOUSE_CMD_SETSCALE21 : PSMOUSE_CMD_SETSCALE11;
-@@ -461,7 +870,7 @@ static int alps_passthrough_mode(struct psmouse *psmouse, bool enable)
+@@ -458,7 +868,7 @@ static int alps_passthrough_mode(struct psmouse *psmouse, bool enable)
return 0;
}
@@ -891,7 +885,7 @@ index f699698..b2bc8ca 100644
{
struct ps2dev *ps2dev = &psmouse->ps2dev;
-@@ -535,13 +944,13 @@ static int alps_poll(struct psmouse *psmouse)
+@@ -533,13 +943,13 @@ static int alps_poll(struct psmouse *psmouse)
bool poll_failed;
if (priv->i->flags & ALPS_PASS)
@@ -907,7 +901,7 @@ index f699698..b2bc8ca 100644
if (poll_failed || (buf[0] & priv->i->mask0) != priv->i->byte0)
return -1;
-@@ -558,13 +967,13 @@ static int alps_poll(struct psmouse *psmouse)
+@@ -556,13 +966,13 @@ static int alps_poll(struct psmouse *psmouse)
return 0;
}
@@ -923,13 +917,13 @@ index f699698..b2bc8ca 100644
return -1;
}
-@@ -573,13 +982,13 @@ static int alps_hw_init(struct psmouse *psmouse)
+@@ -571,13 +981,13 @@ static int alps_hw_init(struct psmouse *psmouse)
return -1;
}
- if (alps_absolute_mode(psmouse)) {
+ if (alps_absolute_mode_v1_v2(psmouse)) {
- printk(KERN_ERR "alps.c: Failed to enable absolute mode\n");
+ psmouse_err(psmouse, "Failed to enable absolute mode\n");
return -1;
}
@@ -939,7 +933,7 @@ index f699698..b2bc8ca 100644
return -1;
}
-@@ -592,6 +1001,297 @@ static int alps_hw_init(struct psmouse *psmouse)
+@@ -590,6 +1000,297 @@ static int alps_hw_init(struct psmouse *psmouse)
return 0;
}
@@ -1237,7 +1231,7 @@ index f699698..b2bc8ca 100644
static int alps_reconnect(struct psmouse *psmouse)
{
const struct alps_model_info *model;
-@@ -632,6 +1332,8 @@ int alps_init(struct psmouse *psmouse)
+@@ -630,6 +1331,8 @@ int alps_init(struct psmouse *psmouse)
psmouse->private = priv;
@@ -1246,7 +1240,7 @@ index f699698..b2bc8ca 100644
model = alps_get_model(psmouse, &version);
if (!model)
goto init_fail;
-@@ -659,8 +1361,20 @@ int alps_init(struct psmouse *psmouse)
+@@ -657,8 +1360,20 @@ int alps_init(struct psmouse *psmouse)
BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_RIGHT);
dev1->evbit[BIT_WORD(EV_ABS)] |= BIT_MASK(EV_ABS);
@@ -1269,7 +1263,7 @@ index f699698..b2bc8ca 100644
input_set_abs_params(dev1, ABS_PRESSURE, 0, 127, 0, 0);
if (model->flags & ALPS_WHEEL) {
-@@ -703,7 +1417,7 @@ int alps_init(struct psmouse *psmouse)
+@@ -701,7 +1416,7 @@ int alps_init(struct psmouse *psmouse)
psmouse->poll = alps_poll;
psmouse->disconnect = alps_disconnect;
psmouse->reconnect = alps_reconnect;
@@ -1320,7 +1314,7 @@ index 4ce9bba..62db7f4 100644
int alps_detect(struct psmouse *psmouse, bool set_properties);
int alps_init(struct psmouse *psmouse);
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
-index 593e910..c2b5aa6 100644
+index 9b84b0c..11a9c6c 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -8,6 +8,7 @@
@@ -1335,10 +1329,10 @@ index 593e910..c2b5aa6 100644
1.7.7.3
-From 8a2d5b12d0a47daf178a842ca009eaf344033cf8 Mon Sep 17 00:00:00 2001
+From 01ce661fc83005947dc958a5739c153843af8a73 Mon Sep 17 00:00:00 2001
From: Seth Forshee <seth.forshee at canonical.com>
Date: Mon, 7 Nov 2011 19:54:13 -0800
-Subject: [PATCH 5/7] Input: ALPS - add semi-MT support for v3 protocol
+Subject: [PATCH 5/6] Input: ALPS - add semi-MT support for v3 protocol
Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
Acked-by: Chase Douglas <chase.douglas at canonical.com>
@@ -1349,7 +1343,7 @@ Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
2 files changed, 215 insertions(+), 19 deletions(-)
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
-index b2bc8ca..15383e1 100644
+index a0248fd..bd87380 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -17,6 +17,7 @@
@@ -1360,7 +1354,7 @@ index b2bc8ca..15383e1 100644
#include <linux/serio.h>
#include <linux/libps2.h>
-@@ -33,6 +34,12 @@
+@@ -26,6 +27,12 @@
/*
* Definitions for ALPS version 3 and 4 command mode protocol
*/
@@ -1373,7 +1367,7 @@ index b2bc8ca..15383e1 100644
#define ALPS_CMD_NIBBLE_10 0x01f2
static const struct alps_nibble_commands alps_v3_nibble_commands[] = {
-@@ -256,6 +263,137 @@ static void alps_process_packet_v1_v2(struct psmouse *psmouse)
+@@ -250,6 +257,137 @@ static void alps_process_packet_v1_v2(struct psmouse *psmouse)
input_sync(dev);
}
@@ -1511,7 +1505,7 @@ index b2bc8ca..15383e1 100644
static void alps_process_trackstick_packet_v3(struct psmouse *psmouse)
{
struct alps_data *priv = psmouse->private;
-@@ -324,16 +462,17 @@ static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)
+@@ -318,16 +456,17 @@ static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)
struct input_dev *dev2 = priv->dev2;
int x, y, z;
int left, right, middle;
@@ -1535,7 +1529,7 @@ index b2bc8ca..15383e1 100644
/*
* Sometimes a position packet will indicate a multi-packet
* sequence, but then what follows is another position
-@@ -341,18 +480,49 @@ static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)
+@@ -335,18 +474,49 @@ static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)
* position packet as usual.
*/
if (packet[0] & 0x40) {
@@ -1591,7 +1585,7 @@ index b2bc8ca..15383e1 100644
left = packet[3] & 0x01;
right = packet[3] & 0x02;
-@@ -372,22 +542,38 @@ static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)
+@@ -366,22 +536,38 @@ static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)
if (x && y && !z)
return;
@@ -1635,7 +1629,7 @@ index b2bc8ca..15383e1 100644
input_sync(dev);
if (!(priv->quirks & ALPS_QUIRK_TRACKSTICK_BUTTONS)) {
-@@ -1369,9 +1555,18 @@ int alps_init(struct psmouse *psmouse)
+@@ -1368,9 +1554,18 @@ int alps_init(struct psmouse *psmouse)
input_set_abs_params(dev1, ABS_Y, 0, 767, 0, 0);
break;
case ALPS_PROTO_V3:
@@ -1672,10 +1666,10 @@ index 62db7f4..a00a4ab 100644
1.7.7.3
-From 281688737cb83dd113cfab809b2c78841451ba32 Mon Sep 17 00:00:00 2001
+From 7cf801cfc0774b777aa6861cf4a43a90b112b1ed Mon Sep 17 00:00:00 2001
From: Seth Forshee <seth.forshee at canonical.com>
Date: Mon, 7 Nov 2011 19:54:35 -0800
-Subject: [PATCH 6/7] Input: ALPS - add documentation for protocol versions 3
+Subject: [PATCH 6/6] Input: ALPS - add documentation for protocol versions 3
and 4
Also converts from using "old" and "new" to describe the already-known
@@ -1865,126 +1859,3 @@ index ab5478f..f274c28 100644
--
1.7.7.3
-
-From 8114d422321fa6bb724a03faf25b101868d6e03d Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer at redhat.com>
-Date: Mon, 12 Dec 2011 15:12:00 -0500
-Subject: [PATCH 7/7] Revert psmouse_* print format changes from the
- backported patches. Sigh
-
-Signed-off-by: Josh Boyer <jwboyer at redhat.com>
----
- drivers/input/mouse/alps.c | 29 ++++++++++++-----------------
- 1 files changed, 12 insertions(+), 17 deletions(-)
-
-diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
-index 15383e1..4925a63 100644
---- a/drivers/input/mouse/alps.c
-+++ b/drivers/input/mouse/alps.c
-@@ -403,7 +403,7 @@ static void alps_process_trackstick_packet_v3(struct psmouse *psmouse)
-
- /* Sanity check packet */
- if (!(packet[0] & 0x40)) {
-- psmouse_dbg(psmouse, "Bad trackstick packet, discarding\n");
-+ dbg("Bad trackstick packet, discarding\n");
- return;
- }
-
-@@ -922,13 +922,12 @@ static int alps_enter_command_mode(struct psmouse *psmouse,
- ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_WRAP) ||
- ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_WRAP) ||
- ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO)) {
-- psmouse_err(psmouse, "failed to enter command mode\n");
-+ printk(KERN_ERR "alps.c: failed to enter command mode\n");
- return -1;
- }
-
- if (param[0] != 0x88 && param[1] != 0x07) {
-- psmouse_dbg(psmouse,
-- "unknown response while entering command mode: %2.2x %2.2x %2.2x\n",
-+ dbg("unknown response while entering command mode: %2.2x %2.2x %2.2x\n",
- param[0], param[1], param[2]);
- return -1;
- }
-@@ -1012,8 +1011,7 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int
- */
- model = NULL;
- if (alps_enter_command_mode(psmouse, param)) {
-- psmouse_warn(psmouse,
-- "touchpad failed to enter command mode\n");
-+ printk(KERN_WARNING "alps.c: touchpad failed to enter command mode\n");
- } else {
- for (i = 0; i < ARRAY_SIZE(alps_model_data); i++) {
- if (alps_model_data[i].proto_version > ALPS_PROTO_V2 &&
-@@ -1025,8 +1023,7 @@ static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int
- alps_exit_command_mode(psmouse);
-
- if (!model)
-- psmouse_dbg(psmouse,
-- "Unknown command mode response %2.2x\n",
-+ dbg("Unknown command mode response %2.2x\n",
- param[0]);
- }
- }
-@@ -1263,10 +1260,9 @@ static int alps_hw_init_v3(struct psmouse *psmouse)
- ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE21) ||
- ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE21) ||
- ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO)) {
-- psmouse_warn(psmouse, "trackstick E7 report failed\n");
-+ printk(KERN_WARNING "alps.c: trackstick E7 report failed\n");
- } else {
-- psmouse_dbg(psmouse,
-- "trackstick E7 report: %2.2x %2.2x %2.2x\n",
-+ dbg("trackstick E7 report: %2.2x %2.2x %2.2x\n",
- param[0], param[1], param[2]);
-
- /*
-@@ -1280,8 +1276,7 @@ static int alps_hw_init_v3(struct psmouse *psmouse)
- ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) ||
- alps_command_mode_send_nibble(psmouse, 0x9) ||
- alps_command_mode_send_nibble(psmouse, 0x4)) {
-- psmouse_err(psmouse,
-- "Error sending magic E6 sequence\n");
-+ printk(KERN_ERR "alps.c: Error sending magic E6 sequence\n");
- goto error_passthrough;
- }
- }
-@@ -1293,7 +1288,7 @@ static int alps_hw_init_v3(struct psmouse *psmouse)
- }
-
- if (alps_absolute_mode_v3(psmouse)) {
-- psmouse_err(psmouse, "Failed to enter absolute mode\n");
-+ printk(KERN_ERR "alps.c: Failed to enter absolute mode\n");
- goto error;
- }
-
-@@ -1343,7 +1338,7 @@ static int alps_hw_init_v3(struct psmouse *psmouse)
- param[0] = 0x64;
- if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE) ||
- ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE)) {
-- psmouse_err(psmouse, "Failed to enable data reporting\n");
-+ printk(KERN_ERR "alps.c: Failed to enable data reporting\n");
- return -1;
- }
-
-@@ -1392,7 +1387,7 @@ static int alps_hw_init_v4(struct psmouse *psmouse)
- goto error;
-
- if (alps_absolute_mode_v4(psmouse)) {
-- psmouse_err(psmouse, "Failed to enter absolute mode\n");
-+ printk(KERN_ERR "alps.c: Failed to enter absolute mode\n");
- goto error;
- }
-
-@@ -1440,7 +1435,7 @@ static int alps_hw_init_v4(struct psmouse *psmouse)
- param[0] = 0x64;
- if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE) ||
- ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE)) {
-- psmouse_err(psmouse, "Failed to enable data reporting\n");
-+ printk(KERN_ERR "alps.c: Failed to enable data reporting\n");
- return -1;
- }
-
---
-1.7.7.3
-
diff --git a/compat-wireless-config-fixups.patch b/compat-wireless-config-fixups.patch
index 2e99b5d..938f35c 100644
--- a/compat-wireless-config-fixups.patch
+++ b/compat-wireless-config-fixups.patch
@@ -1,6 +1,6 @@
-diff -up compat-wireless-3.2-rc6-3/config.mk.orig compat-wireless-3.2-rc6-3/config.mk
---- compat-wireless-3.2-rc6-3/config.mk.orig 2012-01-03 09:41:57.090827042 -0500
-+++ compat-wireless-3.2-rc6-3/config.mk 2012-01-03 09:42:19.259549896 -0500
+diff -up compat-wireless-2011-12-18/config.mk.orig compat-wireless-2011-12-18/config.mk
+--- compat-wireless-2011-12-18/config.mk.orig 2012-01-05 13:54:21.214595837 -0500
++++ compat-wireless-2011-12-18/config.mk 2012-01-05 13:54:35.668415136 -0500
@@ -14,6 +14,9 @@ else
include $(KLIB_BUILD)/.config
endif
@@ -10,8 +10,8 @@ diff -up compat-wireless-3.2-rc6-3/config.mk.orig compat-wireless-3.2-rc6-3/conf
+
ifneq ($(wildcard $(KLIB_BUILD)/Makefile),)
- COMPAT_LATEST_VERSION = 1
-@@ -353,7 +356,7 @@ ifdef CONFIG_CRC_CCITT
+ COMPAT_LATEST_VERSION = 3
+@@ -395,7 +398,7 @@ ifdef CONFIG_CRC_CCITT
CONFIG_RT2800PCI=m
CONFIG_RT2800PCI_RT33XX=y
CONFIG_RT2800PCI_RT35XX=y
@@ -20,7 +20,7 @@ diff -up compat-wireless-3.2-rc6-3/config.mk.orig compat-wireless-3.2-rc6-3/conf
endif #CONFIG_CRC_CCITT
NEED_RT2X00=y
-@@ -481,7 +484,7 @@ ifdef CONFIG_CRC_CCITT
+@@ -525,7 +528,7 @@ ifdef CONFIG_CRC_CCITT
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
@@ -29,17 +29,15 @@ diff -up compat-wireless-3.2-rc6-3/config.mk.orig compat-wireless-3.2-rc6-3/conf
CONFIG_RT2800USB_UNKNOWN=y
endif #CONFIG_CRC_CCITT
CONFIG_RT2X00_LIB_USB=m
-diff -up compat-wireless-3.2-rc6-3/drivers/misc/eeprom/Makefile.orig compat-wireless-3.2-rc6-3/drivers/misc/eeprom/Makefile
---- compat-wireless-3.2-rc6-3/drivers/misc/eeprom/Makefile.orig 2012-01-03 09:41:57.104826867 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/misc/eeprom/Makefile 2012-01-03 09:42:03.468747311 -0500
-@@ -1,3 +1,3 @@
+diff -up compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile.orig compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile
+--- compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile.orig 2012-01-05 13:54:21.214595837 -0500
++++ compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile 2012-01-05 13:54:27.274520077 -0500
+@@ -1 +1 @@
-obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o
+#obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o
- obj-$(CONFIG_EEPROM_93XX46) += eeprom_93xx46.o
- obj-$(CONFIG_EEPROM_DIGSY_MTC_CFG) += digsy_mtc_eeprom.o
-diff -up compat-wireless-3.2-rc6-3/drivers/net/ethernet/atheros/Makefile.orig compat-wireless-3.2-rc6-3/drivers/net/ethernet/atheros/Makefile
---- compat-wireless-3.2-rc6-3/drivers/net/ethernet/atheros/Makefile.orig 2012-01-03 09:41:57.107826831 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/ethernet/atheros/Makefile 2012-01-03 09:42:03.469747299 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile.orig compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile
+--- compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile.orig 2012-01-05 13:54:21.215595824 -0500
++++ compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile 2012-01-05 13:54:27.275520064 -0500
@@ -2,7 +2,7 @@
# Makefile for the Atheros network device drivers.
#
@@ -52,9 +50,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/ethernet/atheros/Makefile.orig co
+#obj-$(CONFIG_ATL2) += atlx/
+#obj-$(CONFIG_ATL1E) += atl1e/
+#obj-$(CONFIG_ATL1C) += atl1c/
-diff -up compat-wireless-3.2-rc6-3/drivers/net/usb/Makefile.orig compat-wireless-3.2-rc6-3/drivers/net/usb/Makefile
---- compat-wireless-3.2-rc6-3/drivers/net/usb/Makefile.orig 2012-01-03 09:41:57.108826819 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/usb/Makefile 2012-01-03 09:42:03.469747299 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/usb/Makefile.orig compat-wireless-2011-12-18/drivers/net/usb/Makefile
+--- compat-wireless-2011-12-18/drivers/net/usb/Makefile.orig 2012-01-05 13:54:21.215595824 -0500
++++ compat-wireless-2011-12-18/drivers/net/usb/Makefile 2012-01-05 13:54:27.275520064 -0500
@@ -2,7 +2,7 @@
# Makefile for USB Network drivers
#
@@ -66,9 +64,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/usb/Makefile.orig compat-wireless
+#obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST) += rndis_host.o
+#obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o
-diff -up compat-wireless-3.2-rc6-3/Makefile.orig compat-wireless-3.2-rc6-3/Makefile
---- compat-wireless-3.2-rc6-3/Makefile.orig 2012-01-03 09:41:57.109826807 -0500
-+++ compat-wireless-3.2-rc6-3/Makefile 2012-01-03 09:42:03.470747287 -0500
+diff -up compat-wireless-2011-12-18/Makefile.orig compat-wireless-2011-12-18/Makefile
+--- compat-wireless-2011-12-18/Makefile.orig 2012-01-05 13:54:21.216595811 -0500
++++ compat-wireless-2011-12-18/Makefile 2012-01-05 13:54:27.276520051 -0500
@@ -8,8 +8,8 @@ endif
export KLIB_BUILD ?= $(KLIB)/build
# Sometimes not available in the path
diff --git a/compat-wireless-pr_fmt-warning-avoidance.patch b/compat-wireless-pr_fmt-warning-avoidance.patch
index 9403b1b..7ca8f02 100644
--- a/compat-wireless-pr_fmt-warning-avoidance.patch
+++ b/compat-wireless-pr_fmt-warning-avoidance.patch
@@ -1,6 +1,6 @@
-diff -up compat-wireless-3.2-rc6-3/compat/crc8.c.orig compat-wireless-3.2-rc6-3/compat/crc8.c
---- compat-wireless-3.2-rc6-3/compat/crc8.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/compat/crc8.c 2012-01-05 14:17:19.613363481 -0500
+diff -up compat-wireless-2011-12-18/compat/crc8.c.orig compat-wireless-2011-12-18/compat/crc8.c
+--- compat-wireless-2011-12-18/compat/crc8.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/compat/crc8.c 2012-01-05 13:40:29.271996550 -0500
@@ -14,6 +14,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
@@ -9,9 +9,9 @@ diff -up compat-wireless-3.2-rc6-3/compat/crc8.c.orig compat-wireless-3.2-rc6-3/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/bcma/bcma_private.h.orig compat-wireless-3.2-rc6-3/drivers/bcma/bcma_private.h
---- compat-wireless-3.2-rc6-3/drivers/bcma/bcma_private.h.orig 2011-12-19 22:45:13.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/bcma/bcma_private.h 2012-01-05 14:17:19.614363468 -0500
+diff -up compat-wireless-2011-12-18/drivers/bcma/bcma_private.h.orig compat-wireless-2011-12-18/drivers/bcma/bcma_private.h
+--- compat-wireless-2011-12-18/drivers/bcma/bcma_private.h.orig 2011-12-18 16:10:34.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/bcma/bcma_private.h 2012-01-05 13:40:29.271996550 -0500
@@ -1,6 +1,7 @@
#ifndef LINUX_BCMA_PRIVATE_H_
#define LINUX_BCMA_PRIVATE_H_
@@ -20,9 +20,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/bcma/bcma_private.h.orig compat-wirel
#ifndef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#endif
-diff -up compat-wireless-3.2-rc6-3/drivers/net/ethernet/broadcom/b44.c.orig compat-wireless-3.2-rc6-3/drivers/net/ethernet/broadcom/b44.c
---- compat-wireless-3.2-rc6-3/drivers/net/ethernet/broadcom/b44.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/ethernet/broadcom/b44.c 2012-01-05 14:17:19.615363455 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/ethernet/broadcom/b44.c.orig compat-wireless-2011-12-18/drivers/net/ethernet/broadcom/b44.c
+--- compat-wireless-2011-12-18/drivers/net/ethernet/broadcom/b44.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/ethernet/broadcom/b44.c 2012-01-05 13:40:29.273996525 -0500
@@ -10,6 +10,7 @@
* Distribute under GPL.
*/
@@ -31,11 +31,31 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/ethernet/broadcom/b44.c.orig comp
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/brcm80211/brcmsmac/dma.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/brcm80211/brcmsmac/dma.c
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/iwlegacy/iwl3945-base.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/iwlegacy/iwl3945-base.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/iwlegacy/iwl3945-base.c.orig 2012-01-05 14:19:37.561638888 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/iwlegacy/iwl3945-base.c 2012-01-05 14:19:45.500539640 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c.orig compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c.orig 2012-01-05 13:44:54.137685272 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c 2012-01-05 13:44:56.589654617 -0500
+@@ -16,6 +16,7 @@
+ * File contents: support functions for PCI/PCIe
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/delay.h>
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/dma.c.orig compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/dma.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/dma.c.orig 2012-01-05 13:44:23.579067307 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/dma.c 2012-01-05 13:44:43.324820451 -0500
+@@ -14,6 +14,7 @@
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+ #include <linux/slab.h>
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/3945-mac.c.orig compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/3945-mac.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/3945-mac.c.orig 2012-01-05 13:41:22.852326703 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/3945-mac.c 2012-01-05 13:41:31.209222227 -0500
@@ -27,6 +27,7 @@
*
*****************************************************************************/
@@ -44,9 +64,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/iwlegacy/iwl3945-base.c.
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/iwlegacy/iwl4965-base.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/iwlegacy/iwl4965-base.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/iwlegacy/iwl4965-base.c.orig 2012-01-05 14:19:25.875784981 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/iwlegacy/iwl4965-base.c 2012-01-05 14:19:31.017720699 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/4965-mac.c.orig compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/4965-mac.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/4965-mac.c.orig 2012-01-05 13:41:47.962012787 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/4965-mac.c 2012-01-05 13:41:41.547092984 -0500
@@ -27,6 +27,7 @@
*
*****************************************************************************/
@@ -55,9 +75,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/iwlegacy/iwl4965-base.c.
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/cfg.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/cfg.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/cfg.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/cfg.c 2012-01-05 14:17:22.706324811 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/cfg.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/cfg.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/libertas/cfg.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/cfg.c 2012-01-05 13:40:44.681803897 -0500
@@ -6,6 +6,7 @@
*
*/
@@ -66,9 +86,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/cfg.c.orig comp
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/hardirq.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_cs.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_cs.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_cs.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_cs.c 2012-01-05 14:17:22.707324799 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_cs.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_cs.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_cs.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_cs.c 2012-01-05 13:40:44.682803885 -0500
@@ -21,6 +21,7 @@
*/
@@ -77,9 +97,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_cs.c.orig co
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_sdio.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_sdio.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_sdio.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_sdio.c 2012-01-05 14:17:22.709324775 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_sdio.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_sdio.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_sdio.c.orig 2011-12-18 16:10:36.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_sdio.c 2012-01-05 13:40:44.683803873 -0500
@@ -26,6 +26,7 @@
* if_sdio_card_to_host() to pad the data.
*/
@@ -88,9 +108,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_sdio.c.orig
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_spi.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_spi.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_spi.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_spi.c 2012-01-05 14:17:22.710324763 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_spi.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_spi.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_spi.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_spi.c 2012-01-05 13:40:44.685803849 -0500
@@ -17,6 +17,7 @@
* (at your option) any later version.
*/
@@ -99,9 +119,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_spi.c.orig c
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/hardirq.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_usb.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_usb.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_usb.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_usb.c 2012-01-05 14:17:22.711324751 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_usb.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_usb.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_usb.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_usb.c 2012-01-05 13:40:44.686803837 -0500
@@ -2,6 +2,7 @@
* This file contains functions used in USB interface module.
*/
@@ -110,9 +130,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/if_usb.c.orig c
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/delay.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/main.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/main.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/main.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/main.c 2012-01-05 14:17:22.712324738 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/main.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/main.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/libertas/main.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/main.c 2012-01-05 13:40:44.687803825 -0500
@@ -4,6 +4,7 @@
* thread etc..
*/
@@ -121,17 +141,17 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/main.c.orig com
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/mesh.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/mesh.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/mesh.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/mesh.c 2012-01-05 14:17:22.713324725 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/mesh.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/mesh.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/libertas/mesh.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/mesh.c 2012-01-05 13:40:44.688803813 -0500
@@ -1,3 +1,4 @@
+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/delay.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/rx.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/rx.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/rx.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/rx.c 2012-01-05 14:17:22.714324712 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/rx.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/rx.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/libertas/rx.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/rx.c 2012-01-05 13:40:44.689803801 -0500
@@ -2,6 +2,7 @@
* This file contains the handling of RX in wlan driver.
*/
@@ -140,9 +160,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas/rx.c.orig compa
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/etherdevice.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/cmd.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/cmd.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/cmd.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/cmd.c 2012-01-05 14:17:22.715324699 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/cmd.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/cmd.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/cmd.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/cmd.c 2012-01-05 13:40:44.690803789 -0500
@@ -7,6 +7,7 @@
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
@@ -151,9 +171,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/cmd.c.orig c
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/hardirq.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/if_usb.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/if_usb.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/if_usb.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/if_usb.c 2012-01-05 14:17:22.716324687 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/if_usb.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/if_usb.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/if_usb.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/if_usb.c 2012-01-05 13:40:44.691803776 -0500
@@ -9,6 +9,7 @@
*/
#define DRV_NAME "lbtf_usb"
@@ -162,9 +182,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/if_usb.c.ori
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "libertas_tf.h"
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/main.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/main.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/main.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/main.c 2012-01-05 14:17:22.717324675 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/main.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/main.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/main.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/main.c 2012-01-05 13:40:44.692803763 -0500
@@ -7,6 +7,7 @@
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
@@ -173,9 +193,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/libertas_tf/main.c.orig
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/hardirq.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/base.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/base.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/base.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/base.c 2012-01-05 14:17:22.719324651 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/base.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/base.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/base.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/base.c 2012-01-05 13:40:44.693803750 -0500
@@ -27,6 +27,7 @@
*
*****************************************************************************/
@@ -184,9 +204,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/base.c.orig comp
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/ip.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/cam.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/cam.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/cam.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/cam.c 2012-01-05 14:17:22.719324651 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/cam.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/cam.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/cam.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/cam.c 2012-01-05 13:40:44.694803737 -0500
@@ -27,6 +27,7 @@
*
*****************************************************************************/
@@ -195,9 +215,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/cam.c.orig compa
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/export.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c 2012-01-05 14:17:22.720324638 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c 2012-01-05 13:40:44.694803737 -0500
@@ -27,6 +27,7 @@
*
*****************************************************************************/
@@ -206,9 +226,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192c/fw_comm
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/firmware.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c 2012-01-05 14:17:22.722324612 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c 2012-01-05 13:40:44.695803725 -0500
@@ -27,6 +27,7 @@
*
*****************************************************************************/
@@ -217,9 +237,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c.o
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "../wifi.h"
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c 2012-01-05 14:17:22.724324587 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c 2012-01-05 13:40:44.695803725 -0500
@@ -27,6 +27,7 @@
*
****************************************************************************/
@@ -228,9 +248,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c.
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192de/sw.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192de/sw.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192de/sw.c 2012-01-05 14:17:22.724324587 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192de/sw.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192de/sw.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192de/sw.c 2012-01-05 13:40:44.695803725 -0500
@@ -27,6 +27,7 @@
*
*****************************************************************************/
@@ -239,9 +259,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192de/sw.c.o
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/vmalloc.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/hw.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/hw.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/hw.c 2012-01-05 14:17:22.725324575 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/hw.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/hw.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/hw.c 2012-01-05 13:40:44.696803713 -0500
@@ -27,6 +27,7 @@
*
*****************************************************************************/
@@ -250,9 +270,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/hw.c.o
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "../wifi.h"
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/phy.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/phy.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/phy.c 2012-01-05 14:17:22.726324563 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/phy.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/phy.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/phy.c 2012-01-05 13:40:44.696803713 -0500
@@ -27,6 +27,7 @@
*
*****************************************************************************/
@@ -261,9 +281,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/phy.c.
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "../wifi.h"
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/rf.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/rf.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/rf.c 2012-01-05 14:17:22.726324563 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/rf.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/rf.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/rf.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/rf.c 2012-01-05 13:40:44.697803701 -0500
@@ -27,6 +27,7 @@
*
*****************************************************************************/
@@ -272,9 +292,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/rf.c.o
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "../wifi.h"
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/sw.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/sw.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/sw.c 2012-01-05 14:17:22.726324563 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/sw.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/sw.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/sw.c 2012-01-05 13:40:44.697803701 -0500
@@ -27,6 +27,7 @@
*
*****************************************************************************/
@@ -283,9 +303,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/rtl8192se/sw.c.o
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/vmalloc.h>
-diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/usb.c.orig compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/usb.c
---- compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/usb.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/usb.c 2012-01-05 14:17:22.727324551 -0500
+diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/usb.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/usb.c
+--- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/usb.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/usb.c 2012-01-05 13:40:44.697803701 -0500
@@ -25,6 +25,7 @@
*
*****************************************************************************/
@@ -294,9 +314,9 @@ diff -up compat-wireless-3.2-rc6-3/drivers/net/wireless/rtlwifi/usb.c.orig compa
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/usb.h>
-diff -up compat-wireless-3.2-rc6-3/net/wireless/core.c.orig compat-wireless-3.2-rc6-3/net/wireless/core.c
---- compat-wireless-3.2-rc6-3/net/wireless/core.c.orig 2011-12-19 22:45:14.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/net/wireless/core.c 2012-01-05 14:17:22.727324551 -0500
+diff -up compat-wireless-2011-12-18/net/wireless/core.c.orig compat-wireless-2011-12-18/net/wireless/core.c
+--- compat-wireless-2011-12-18/net/wireless/core.c.orig 2011-12-18 16:10:35.000000000 -0500
++++ compat-wireless-2011-12-18/net/wireless/core.c 2012-01-05 13:40:44.698803689 -0500
@@ -4,6 +4,7 @@
* Copyright 2006-2010 Johannes Berg <johannes at sipsolutions.net>
*/
@@ -305,9 +325,9 @@ diff -up compat-wireless-3.2-rc6-3/net/wireless/core.c.orig compat-wireless-3.2-
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/if.h>
-diff -up compat-wireless-3.2-rc6-3/net/wireless/lib80211.c.orig compat-wireless-3.2-rc6-3/net/wireless/lib80211.c
---- compat-wireless-3.2-rc6-3/net/wireless/lib80211.c.orig 2011-12-19 22:45:13.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/net/wireless/lib80211.c 2012-01-05 14:17:22.727324551 -0500
+diff -up compat-wireless-2011-12-18/net/wireless/lib80211.c.orig compat-wireless-2011-12-18/net/wireless/lib80211.c
+--- compat-wireless-2011-12-18/net/wireless/lib80211.c.orig 2011-12-18 16:10:34.000000000 -0500
++++ compat-wireless-2011-12-18/net/wireless/lib80211.c 2012-01-05 13:40:44.698803689 -0500
@@ -13,6 +13,7 @@
*
*/
@@ -316,9 +336,9 @@ diff -up compat-wireless-3.2-rc6-3/net/wireless/lib80211.c.orig compat-wireless-
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h>
-diff -up compat-wireless-3.2-rc6-3/net/wireless/lib80211_crypt_tkip.c.orig compat-wireless-3.2-rc6-3/net/wireless/lib80211_crypt_tkip.c
---- compat-wireless-3.2-rc6-3/net/wireless/lib80211_crypt_tkip.c.orig 2011-12-19 22:45:13.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/net/wireless/lib80211_crypt_tkip.c 2012-01-05 14:17:22.727324551 -0500
+diff -up compat-wireless-2011-12-18/net/wireless/lib80211_crypt_tkip.c.orig compat-wireless-2011-12-18/net/wireless/lib80211_crypt_tkip.c
+--- compat-wireless-2011-12-18/net/wireless/lib80211_crypt_tkip.c.orig 2011-12-18 16:10:34.000000000 -0500
++++ compat-wireless-2011-12-18/net/wireless/lib80211_crypt_tkip.c 2012-01-05 13:40:44.698803689 -0500
@@ -10,6 +10,7 @@
* more details.
*/
@@ -327,9 +347,9 @@ diff -up compat-wireless-3.2-rc6-3/net/wireless/lib80211_crypt_tkip.c.orig compa
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/err.h>
-diff -up compat-wireless-3.2-rc6-3/net/wireless/reg.c.orig compat-wireless-3.2-rc6-3/net/wireless/reg.c
---- compat-wireless-3.2-rc6-3/net/wireless/reg.c.orig 2011-12-19 22:45:13.000000000 -0500
-+++ compat-wireless-3.2-rc6-3/net/wireless/reg.c 2012-01-05 14:17:22.728324538 -0500
+diff -up compat-wireless-2011-12-18/net/wireless/reg.c.orig compat-wireless-2011-12-18/net/wireless/reg.c
+--- compat-wireless-2011-12-18/net/wireless/reg.c.orig 2011-12-18 16:10:34.000000000 -0500
++++ compat-wireless-2011-12-18/net/wireless/reg.c 2012-01-05 13:40:44.699803676 -0500
@@ -33,6 +33,7 @@
*
*/
@@ -338,9 +358,9 @@ diff -up compat-wireless-3.2-rc6-3/net/wireless/reg.c.orig compat-wireless-3.2-r
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
-diff -up compat-wireless-3.2-rc6-3/patches/98-pr_fmt.patch.orig compat-wireless-3.2-rc6-3/patches/98-pr_fmt.patch
---- compat-wireless-3.2-rc6-3/patches/98-pr_fmt.patch.orig 2012-01-05 14:17:22.728324538 -0500
-+++ compat-wireless-3.2-rc6-3/patches/98-pr_fmt.patch 2012-01-05 14:17:22.728324538 -0500
+diff -up compat-wireless-2011-12-18/patches/98-pr_fmt.patch.orig compat-wireless-2011-12-18/patches/98-pr_fmt.patch
+--- compat-wireless-2011-12-18/patches/98-pr_fmt.patch.orig 2012-01-05 13:39:36.552655633 -0500
++++ compat-wireless-2011-12-18/patches/98-pr_fmt.patch 2012-01-05 13:39:36.553655620 -0500
@@ -0,0 +1,346 @@
+The way the compat-* header files are included causes the default
+pr_fmt definition from <linux/kernel.h> to be evaluated for every file.
diff --git a/compat-wireless-rtl8192cu-Fix-WARNING-on-suspend-resume.patch b/compat-wireless-rtl8192cu-Fix-WARNING-on-suspend-resume.patch
index bdc8a54..7a3792c 100644
--- a/compat-wireless-rtl8192cu-Fix-WARNING-on-suspend-resume.patch
+++ b/compat-wireless-rtl8192cu-Fix-WARNING-on-suspend-resume.patch
@@ -1,45 +1,13 @@
-A recent LKML thread (http://lkml.indiana.edu/hypermail/linux/kernel/1112.3/00965.html)
-discusses warnings that occur during a suspend/resume cycle. The driver
-attempts to read the firmware file before userspace is ready, leading to the
-following warning:
-
-WARNING: at drivers/base/firmware_class.c:537 _request_firmware+0x3f6/0x420()
-
-For rtl8192cu, the problem is fixed by storing the firmware in a global buffer
-rather than one allocated per device. The usage count is increased when
-suspending and decreased when resuming. This way, the firmware is retained
-through a suspend/resume cycle, and does not have to be reread.
-
-This patch should fix the bug reported in
-https://bugzilla.redhat.com/show_bug.cgi?id=771002.
-
-Note: This patch also touches rtl8192ce as the "firmware" loaded message
-is now printed in the wrong place.
-Note: This patch also touches rtl8192ce as the "firmware" loaded message
-is now printed in the wrong place.
-
-Reported-by: Mohammed Arafa <bugzilla at xxxxxxxxxxxx>
-Reported-by: Dave Jones <davej at xxxxxxxxxx>
-Signed-off-by: Larry Finger <Larry.Finger at xxxxxxxxxxxx>
-Cc: Linus Torvalds <torvalds at xxxxxxxxxxxxxxxxxxxx>
-Cc: Stable <stable at xxxxxxxxxxxxxxx>
-
----
- drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 1 -
- drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 1 +
- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 58 +++++++++++++++++----
- 3 files changed, 49 insertions(+), 11 deletions(-)
-
---- linux-2.6/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c 2012-01-13 13:07:58.830625006 -0500
-+++ linux-2.6/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c 2012-01-13 13:08:06.825439927 -0500
-@@ -227,7 +227,6 @@ int rtl92c_download_fw(struct ieee80211_
- u32 fwsize;
- enum version_8192c version = rtlhal->version;
-
-- pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
+--- linux-2.6/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
++++ linux-2.6/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+@@ -265,7 +265,6 @@ int rtl92c_download_fw(struct ieee80211_
if (!rtlhal->pfirmware)
return 1;
-
+
+- pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
+ pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
+ pfwdata = (u8 *) rtlhal->pfirmware;
+ fwsize = rtlhal->fwsize;
--- linux-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+++ linux-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
@@ -186,6 +186,7 @@ int rtl92c_init_sw_vars(struct ieee80211
diff --git a/config-arm-generic b/config-arm-generic
index 307c66d..558c7c4 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -142,8 +142,6 @@ CONFIG_SPARSE_IRQ=y
# CONFIG_ARM_PATCH_PHYS_VIRT is not set
-CONFIG_FTMAC100=m
-
CONFIG_HWSPINLOCK_OMAP=m
CONFIG_USE_OF=y
@@ -154,7 +152,17 @@ CONFIG_MMC_SDHCI_OF=m
CONFIG_MMC_SDHCI_PXAV3=m
CONFIG_MMC_SDHCI_PXAV2=m
-CONFIG_FTGMAC100=m
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_MTD_OF_PARTS=y
+CONFIG_PL330_DMA=y
+# CONFIG_ARM_KPROBES_TEST is not set
+# CONFIG_ARM_ATAG_DTB_COMPAT is not set
+
+# CONFIG_FTGMAC100 is not set
+# CONFIG_FTMAC100 is not set
+#
+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+CONFIG_LSM_MMAP_MIN_ADDR=32768
# disable TPM on arm at least on the trimslices it causes havoc
# CONFIG_TCG_TPM is not set
@@ -171,3 +179,18 @@ CONFIG_FTGMAC100=m
# CONFIG_DRM_RADEON is not set
# CONFIG_ATM_HE is not set
# CONFIG_SCSI_ACARD is not set
+
+# these all currently fail due to missing symbols __bad_udelay or
+# error: implicit declaration of function ‘iowrite32be’
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_DRM_NOUVEAU is not set
+# CONFIG_MLX4_EN is not set
+
+# FIXME: Guesses, need checking
+# CONFIG_MACH_EUKREA_CPUIMX35SD is not set
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_ARM_ERRATA_751472=y
+# CONFIG_FB_MX3 is not set
+# CONFIG_MX3_IPU is not set
+# CONFIG_MX3_IPU_IRQS is not set
+
diff --git a/config-arm-highbank b/config-arm-highbank
index 18fc0c4..d4aca82 100644
--- a/config-arm-highbank
+++ b/config-arm-highbank
@@ -1,3 +1,16 @@
ONFIG_ARCH_HIGHBANK=y
CONFIG_VFP=y
CONFIG_NEON=y
+
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEBUG=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
diff --git a/config-arm-imx b/config-arm-imx
index 5ed7ae2..2dbe10a 100644
--- a/config-arm-imx
+++ b/config-arm-imx
@@ -93,3 +93,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
CONFIG_CPU_FREQ_TABLE=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
+
+CONFIG_PL310_ERRATA_769419=y
+CONFIG_LEDS_RENESAS_TPU=y
diff --git a/config-arm-kirkwood b/config-arm-kirkwood
index 6aa045c..415e822 100644
--- a/config-arm-kirkwood
+++ b/config-arm-kirkwood
@@ -40,4 +40,4 @@ CONFIG_RTC_DRV_MV=m
CONFIG_MV_XOR=y
CONFIG_CRYPTO_DEV_MV_CESA=m
-
+# CONFIG_TOUCHSCREEN_EETI is not set
diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index b4163bc..d623e18 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -148,7 +148,6 @@ CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
CONFIG_HW_PERF_EVENTS=y
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
# CONFIG_CC_STACKPROTECTOR is not set
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
@@ -183,10 +182,6 @@ CONFIG_PM_SLEEP_SMP=y
# CONFIG_APM_EMULATION is not set
CONFIG_ARCH_HAS_OPP=y
CONFIG_PM_OPP=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
# CONFIG_NET_IPGRE_DEMUX is not set
# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
# CONFIG_ARPD is not set
@@ -412,7 +407,6 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y
CONFIG_SERIAL_OMAP=y
CONFIG_SERIAL_OMAP_CONSOLE=y
# CONFIG_SERIAL_IFX6X60 is not set
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
# CONFIG_IPMI_HANDLER is not set
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_R3964 is not set
@@ -448,7 +442,6 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_SYSFS=y
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
#
# Memory mapped GPIO expanders:
@@ -624,12 +617,6 @@ CONFIG_REGULATOR_TWL4030=y
# CONFIG_REGULATOR_ISL6271A is not set
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_TPS6524X is not set
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_RC_CORE=y
-CONFIG_LIRC=y
-CONFIG_IR_RC5_SZ_DECODER=y
-CONFIG_IR_LIRC_CODEC=y
-# CONFIG_RC_LOOPBACK is not set
CONFIG_VIDEOBUF_DMA_CONTIG=m
CONFIG_V4L2_MEM2MEM_DEV=m
# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
@@ -806,25 +793,6 @@ CONFIG_SND_SOC_TLV320AIC3X=y
CONFIG_SND_SOC_TWL4030=y
CONFIG_SND_SOC_TWL6040=y
# CONFIG_SOUND_PRIME is not set
-CONFIG_HID=y
-CONFIG_HID_3M_PCT=m
-CONFIG_HID_A4TECH=m
-# CONFIG_HID_ACRUX is not set
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_KYE=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MOSART=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_QUANTA=m
-CONFIG_HID_STANTUM=m
# CONFIG_HID_TIVO_SLIDE is not set
# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
# CONFIG_USB_DEVICEFS is not set
@@ -991,11 +959,6 @@ CONFIG_QUOTA_TREE=m
CONFIG_QFMT_V1=m
CONFIG_QFMT_V2=m
CONFIG_AUTOFS4_FS=m
-CONFIG_ISO9660_FS=m
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_NTFS_DEBUG is not set
# CONFIG_NTFS_RW is not set
# CONFIG_JFFS2_SUMMARY is not set
@@ -1063,9 +1026,6 @@ CONFIG_EARLY_PRINTK=y
# CONFIG_DEBUG_ICEDCC is not set
CONFIG_OC_ETM=y
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_LSM_MMAP_MIN_ADDR=0
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
# CONFIG_IMA is not set
CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_RNG=m
@@ -1099,3 +1059,27 @@ CONFIG_LIBCRC32C=y
# CONFIG_USB_HSO is not set
CONFIG_CRYSTALHD=m
+
+CONFIG_GPIO_GENERIC_PLATFORM=y
+
+CONFIG_MACH_OMAP_GENERIC=y
+CONFIG_PL310_ERRATA_753970=y
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
+CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_SENSORS_AD7314=m
+CONFIG_REGULATOR_GPIO=y
+CONFIG_VIDEO_MT9P031=m
+CONFIG_VIDEO_MT9T001=m
+CONFIG_VIDEO_S5K6AA=m
+CONFIG_PANEL_DVI=m
+CONFIG_PANEL_PICODLP=m
+CONFIG_USB_RENESAS_USBHS=m
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_LEDS_RENESAS_TPU=y
+# CONFIG_OMAP_IOMMU is not set
+CONFIG_USB_RENESAS_USBHS_HCD=m
+
diff --git a/config-arm-tegra b/config-arm-tegra
index b131978..495e91e 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -83,3 +83,10 @@ CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CRYSTALHD=m
+
+CONFIG_MACH_VENTANA=y
+CONFIG_PL310_ERRATA_753970=y
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
+CONFIG_LEDS_RENESAS_TPU=y
diff --git a/config-backports b/config-backports
index c1b1781..33a3adc 100644
--- a/config-backports
+++ b/config-backports
@@ -12,6 +12,11 @@
# CONFIG_B44 is not set
#
+# Prevent b43 and brcmsmac from competing
+#
+# CONFIG_B43_BCMA is not set
+
+#
# These have to be turned-on again since compat-wireless does not
# provide them...
#
diff --git a/config-debug b/config-debug
index a252390..19ae465 100644
--- a/config-debug
+++ b/config-debug
@@ -24,6 +24,7 @@ CONFIG_FAIL_MAKE_REQUEST=y
CONFIG_FAULT_INJECTION_DEBUG_FS=y
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
CONFIG_FAIL_IO_TIMEOUT=y
+CONFIG_FAIL_MMC_REQUEST=y
CONFIG_SLUB_DEBUG_ON=y
@@ -81,7 +82,6 @@ CONFIG_CARL9170_DEBUGFS=y
CONFIG_IWLWIFI_DEVICE_TRACING=y
CONFIG_DEBUG_OBJECTS_WORK=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
CONFIG_DMADEVICES_DEBUG=y
CONFIG_DMADEVICES_VDEBUG=y
@@ -99,9 +99,8 @@ CONFIG_KDB_KEYBOARD=y
CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
CONFIG_TEST_LIST_SORT=y
-CONFIG_DEBUG_SET_MODULE_RONX=y
-
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
diff --git a/config-generic b/config-generic
index b620c95..7c327d4 100644
--- a/config-generic
+++ b/config-generic
@@ -32,7 +32,7 @@ CONFIG_KERNEL_GZIP=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_FHANDLE=y
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
@@ -68,6 +68,7 @@ CONFIG_SLUB=y
CONFIG_MISC_DEVICES=y
# CONFIG_AD525X_DPOT is not set
+# CONFIG_ATMEL_PWM is not set
CONFIG_IWMC3200TOP=m
# CONFIG_IWMC3200TOP_DEBUG is not set
CONFIG_IWMC3200TOP_DEBUGFS=y
@@ -80,7 +81,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_LOAD is not set
# -- MODULE_FORCE_UNLOAD is controlled by config-debug/nodebug
# CONFIG_MODVERSIONS is not set
-CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -89,6 +90,8 @@ CONFIG_PCI=y
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_STUB=y
CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
CONFIG_HT_IRQ=y
CONFIG_PCI_MSI=y
CONFIG_PCIEPORTBUS=y
@@ -157,6 +160,7 @@ CONFIG_INFINIBAND_AMSO1100=m
# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
CONFIG_INFINIBAND_CXGB3=m
CONFIG_INFINIBAND_CXGB4=m
+CONFIG_SCSI_CXGB3_ISCSI=m
CONFIG_SCSI_CXGB4_ISCSI=m
# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
CONFIG_MLX4_INFINIBAND=m
@@ -273,6 +277,7 @@ CONFIG_MTDRAM_ERASE_SIZE=128
# CONFIG_MTD_DOCPROBE is not set
# CONFIG_MTD_DOCPROBE_ADVANCED is not set
# CONFIG_MTD_DOCPROBE_ADDRESS is not set
+# CONFIG_MTD_DOCG3 is not set
#
# NAND Flash Device Drivers
@@ -351,6 +356,7 @@ CONFIG_BLK_CPQ_DA=m
CONFIG_BLK_CPQ_CISS_DA=m
CONFIG_CISS_SCSI_TAPE=y
CONFIG_BLK_DEV_DAC960=m
+CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_UMEM=m
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
@@ -432,6 +438,7 @@ CONFIG_BLK_DEV_IDEDMA=y
CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MMIO=m
CONFIG_VIRTIO_NET=m
CONFIG_VMXNET3=m
CONFIG_HW_RANDOM_VIRTIO=m
@@ -498,15 +505,13 @@ CONFIG_SCSI_3W_9XXX=m
CONFIG_SCSI_ACARD=m
CONFIG_SCSI_AACRAID=m
CONFIG_SCSI_AIC7XXX=m
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_AIC7XXX_OLD=m
CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
CONFIG_AIC7XXX_RESET_DELAY_MS=15000
# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
CONFIG_AIC7XXX_DEBUG_MASK=0
# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC7XXX_OLD=m
CONFIG_SCSI_AIC79XX=m
CONFIG_AIC79XX_CMDS_PER_DEVICE=4
CONFIG_AIC79XX_RESET_DELAY_MS=15000
@@ -514,6 +519,8 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000
# CONFIG_AIC79XX_DEBUG_ENABLE is not set
CONFIG_AIC79XX_DEBUG_MASK=0
# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
# CONFIG_SCSI_ADVANSYS is not set
CONFIG_SCSI_BFA_FC=m
CONFIG_MEGARAID_NEWGEN=y
@@ -528,6 +535,8 @@ CONFIG_SCSI_MPT2SAS=m
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
CONFIG_SCSI_MPT2SAS_LOGGING=y
+CONFIG_SCSI_MVUMI=m
+
CONFIG_SCSI_OSD_INITIATOR=m
CONFIG_SCSI_OSD_ULD=m
CONFIG_SCSI_OSD_DPRINT_SENSE=1
@@ -543,6 +552,59 @@ CONFIG_SCSI_PM8001=m
CONFIG_VMWARE_PVSCSI=m
CONFIG_VMWARE_BALLOON=m
+# CONFIG_SCSI_ARCMSR is not set
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_FLASHPOINT=y
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INIA100=m
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_DC395x=m
+# CONFIG_SCSI_NSP32 is not set
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_DC390T=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_DPT_I2O is not set
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+
+# PCMCIA SCSI adapter support
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+
+# ISA SCSI Controllers. Sorry your life sucks.
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+
+
CONFIG_ATA=y
CONFIG_ATA_BMDMA=y
CONFIG_ATA_VERBOSE_ERROR=y
@@ -622,48 +684,6 @@ CONFIG_PATA_VIA=m
CONFIG_PATA_WINBOND=m
CONFIG_PATA_ATP867X=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_FLASHPOINT=y
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_PIO is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_DC395x=m
-# CONFIG_SCSI_NSP32 is not set
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_DC390T=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_DPT_I2O is not set
-CONFIG_SCSI_LPFC=m
-
-#
-# PCMCIA SCSI adapter support
-#
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-# CONFIG_PCMCIA_FDOMAIN is not set
-CONFIG_PCMCIA_NINJA_SCSI=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-
#
# Multi-device support (RAID and LVM)
@@ -687,6 +707,9 @@ CONFIG_DM_DEBUG=y
CONFIG_DM_MIRROR=y
CONFIG_DM_MULTIPATH=m
CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_THIN_PROVISIONING=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_SPACE_MAPS is not set
CONFIG_DM_UEVENT=y
CONFIG_DM_ZERO=y
CONFIG_DM_LOG_USERSPACE=m
@@ -737,6 +760,8 @@ CONFIG_FIREWIRE_NOSY=m
#
CONFIG_NET=y
+CONFIG_NET_DMA=y
+
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_BIC=m
CONFIG_TCP_CONG_CUBIC=y
@@ -801,6 +826,7 @@ CONFIG_IP_VS_PROTO_UDP=y
CONFIG_IP_VS_PROTO_ESP=y
CONFIG_IP_VS_PROTO_AH=y
CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_IPV6=y
CONFIG_IP_VS_RR=m
CONFIG_IP_VS_WRR=m
CONFIG_IP_VS_LC=m
@@ -845,21 +871,31 @@ CONFIG_NET_9P_RDMA=m
# CONFIG_DECNET is not set
CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
+
+# PHY timestamping adds overhead
# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+
CONFIG_NETFILTER=y
CONFIG_NETFILTER_ADVANCED=y
CONFIG_NF_CONNTRACK=m
CONFIG_NETFILTER_NETLINK=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_TPROXY=m
CONFIG_NETFILTER_XTABLES=y
CONFIG_NETFILTER_XT_SET=m
CONFIG_NETFILTER_XT_MARK=m
CONFIG_NETFILTER_XT_CONNMARK=m
+
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
CONFIG_NETFILTER_XT_TARGET_MARK=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -870,24 +906,31 @@ 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_TARGET_TPROXY=m
+
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
CONFIG_NETFILTER_XT_MATCH_DSCP=m
CONFIG_NETFILTER_XT_MATCH_ESP=m
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
CONFIG_NETFILTER_XT_MATCH_MAC=m
CONFIG_NETFILTER_XT_MATCH_MARK=m
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
@@ -895,23 +938,15 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=y
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
CONFIG_NETFILTER_XT_MATCH_TIME=m
CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_BRIDGE_NETFILTER=y
@@ -1058,7 +1093,7 @@ CONFIG_LLC=m
CONFIG_IPX=m
# CONFIG_IPX_INTERN is not set
CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=y
+CONFIG_DEV_APPLETALK=m
CONFIG_IPDDP=m
CONFIG_IPDDP_ENCAP=y
CONFIG_IPDDP_DECAP=y
@@ -1072,7 +1107,7 @@ CONFIG_IP_DCCP_CCID2=m
CONFIG_IP_DCCP_CCID3=y
# CONFIG_IP_DCCP_CCID3_DEBUG is not set
# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_NET_DCCPPROBE=m
+# CONFIG_NET_DCCPPROBE is not set
#
# TIPC Configuration (EXPERIMENTAL)
@@ -1102,6 +1137,7 @@ CONFIG_NET_SCH_TBF=m
CONFIG_NET_SCH_TEQL=m
CONFIG_NET_SCH_SFB=m
CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_MULTIQ=m
CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_CLS=y
@@ -1127,6 +1163,7 @@ CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_TEXT=m
CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_ACT_CSUM=m
CONFIG_NET_ACT_GACT=m
CONFIG_GACT_PROB=y
CONFIG_NET_ACT_IPT=m
@@ -1135,7 +1172,7 @@ CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_POLICE=m
CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_SKBEDIT=m
CONFIG_DCB=y
@@ -1221,42 +1258,43 @@ CONFIG_RFKILL_INPUT=y
#
# Ethernet (10 or 100Mbit)
#
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEV_10000=y
-CONFIG_NET_ETHERNET=y
-CONFIG_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_FIXED_PHY=y
-CONFIG_MDIO_BITBANG=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_BCM63XX_PHY=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_STE10XP=m
-CONFIG_VITESSE_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_MII=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_DNET=m
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_DA is not set
-# CONFIG_STMMAC_DUAL_MAC is not set
-# CONFIG_STMMAC_TIMER is not set
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_PCH_GBE is not set
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+
+CONFIG_NET_VENDOR_AMD=y
+# CONFIG_LANCE is not set
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_PCMCIA_NMCLAN=m
+
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1C=m
+CONFIG_ATL1E=m
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+
+# CONFIG_NET_VENDOR_CIRRUS is not set
+#
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_EWRK3=m
#
# Tulip family network device support
#
@@ -1273,115 +1311,194 @@ CONFIG_WINBOND_840=m
CONFIG_DM9102=m
CONFIG_PCMCIA_XIRCOM=m
CONFIG_ULI526X=m
-# CONFIG_HP100 is not set
-CONFIG_LNE390=m
-CONFIG_NE3210=m
-CONFIG_ES3210=m
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_B44=m
-CONFIG_B44_PCI=y
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1C=m
-CONFIG_ATL2=m
-CONFIG_ATL1E=m
+
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_FUJITSU is not set
+# CONFIG_NET_VENDOR_HP is not set
+CONFIG_NET_VENDOR_INTEL=y
CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_FORCEDETH=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBEVF=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBE_DCB=y
+
+# CONFIG_NET_VENDOR_I825XX is not set
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KSZ884X_PCI=m
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851_MLL is not set
+
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+
+CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+
+CONFIG_NET_VENDOR_8390=y
+# CONFIG_AC3200 is not set
+CONFIG_PCMCIA_AXNET=m
CONFIG_NE2K_PCI=m
+CONFIG_NE3210=m
+CONFIG_PCMCIA_PCNET=m
+
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+
+CONFIG_NET_VENDOR_OKI=y
+# CONFIG_PCH_GBE is not set
+
+CONFIG_NET_PACKET_ENGINE=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
CONFIG_8139CP=m
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+
+# CONFIG_NET_VENDOR_SEEQ is not set
+
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+
+CONFIG_NET_VENDOR_SIS=y
CONFIG_SIS900=m
CONFIG_SIS190=m
+
+CONFIG_NET_VENDOR_SMSC=y
+# CONFIG_SMC9194 is not set
+CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
-CONFIG_SC92031=m
CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
+
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_DA is not set
+# CONFIG_STMMAC_DUAL_MAC is not set
+# CONFIG_STMMAC_TIMER is not set
+# CONFIG_STMMAC_DEBUG_FS is not set
+
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+
+CONFIG_NET_VENDOR_TI=y
CONFIG_TLAN=m
+
+CONFIG_NET_VENDOR_VIA=y
CONFIG_VIA_RHINE=m
CONFIG_VIA_RHINE_MMIO=y
CONFIG_VIA_VELOCITY=m
+
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+
+CONFIG_PHYLIB=y
+CONFIG_BROADCOM_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_FIXED_PHY=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_BCM63XX_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_VITESSE_PHY=m
+CONFIG_MICREL_PHY=m
+
+CONFIG_MII=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_DNET=m
+
+
+CONFIG_LNE390=m
+CONFIG_ES3210=m
+CONFIG_NET_PCI=y
+CONFIG_B44=m
+CONFIG_B44_PCI=y
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_FEALNX=m
CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_CASSINI=m
CONFIG_ETHOC=m
-# CONFIG_KS8842 is not set
-# CONFIG_KS8851_MLL is not set
#
# Ethernet (1000 Mbit)
#
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
CONFIG_TIGON3=m
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
CONFIG_JME=m
-#
-# Ethernet (10000 Mbit)
-#
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_IP1000=m
-CONFIG_IXGB=m
-CONFIG_IXGBEVF=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBE_DCB=y
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
-CONFIG_NIU=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_TEHUTI=m
-CONFIG_ENIC=m
+#
+# Ethernet (10000 Mbit)
+#
+CONFIG_IP1000=m
CONFIG_MLX4_EN=m
# CONFIG_MLX4_DEBUG is not set
-CONFIG_QLCNIC=m
-CONFIG_QLGE=m
-CONFIG_BNA=m
CONFIG_SFC=m
CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-CONFIG_FDDI=y
+# CONFIG_FDDI is not set
# CONFIG_DEFXX is not set
-CONFIG_SKFP=m
+# CONFIG_SKFP is not set
# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
+# CONFIG_PLIP is not set
CONFIG_PPP=m
CONFIG_PPP_MULTILINK=y
CONFIG_PPP_FILTER=y
@@ -1389,13 +1506,10 @@ CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
CONFIG_PPP_DEFLATE=m
CONFIG_IPPP_FILTER=y
-# CONFIG_PPP_BSDCOMP is not set
+CONFIG_PPP_BSDCOMP=y
CONFIG_PPPOE=m
CONFIG_PPP_MPPE=m
-CONFIG_SLIP=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-# CONFIG_SLIP_MODE_SLIP6 is not set
+# CONFIG_SLIP is not set
#
# Wireless LAN
@@ -1444,6 +1558,8 @@ CONFIG_ATH_COMMON=m
CONFIG_ATH5K=m
CONFIG_ATH5K_DEBUG=y
# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_DEBUG=y
CONFIG_ATH9K=m
CONFIG_ATH9K_PCI=y
CONFIG_ATH9K_AHB=y
@@ -1454,6 +1570,7 @@ CONFIG_ATH9K_HTC=m
CONFIG_ATH9K_RATE_CONTROL=y
CONFIG_CARL9170=m
CONFIG_CARL9170_LEDS=y
+# CONFIG_CARL9170_HWRNG is not set
CONFIG_AT76C50X_USB=m
CONFIG_AIRO=m
CONFIG_AIRO_CS=m
@@ -1466,6 +1583,7 @@ CONFIG_B43_BCMA_PIO=y
# CONFIG_B43_DEBUG is not set
CONFIG_B43_PHY_LP=y
CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_HT=y
# CONFIG_B43_FORCE_PIO is not set
CONFIG_B43LEGACY=m
# CONFIG_B43LEGACY_DEBUG is not set
@@ -1474,6 +1592,9 @@ CONFIG_B43LEGACY_PIO=y
CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
# CONFIG_B43LEGACY_DMA_MODE is not set
# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+# CONFIG_BRCMDBG is not set
CONFIG_HERMES=m
CONFIG_HERMES_CACHE_FW_ON_INIT=y
# CONFIG_HERMES_PRISM is not set
@@ -1573,24 +1694,12 @@ CONFIG_RTL8192DE=m
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
-
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMDBG is not set
+CONFIG_MWIFIEX_PCIE=m
#
# Token Ring devices
#
# CONFIG_TR is not set
-# CONFIG_IBMOL is not set
-# CONFIG_3C359 is not set
-# Broken with gcc4.1
-# CONFIG_TMS380TR is not set
-# CONFIG_TMSPCI is not set
-# CONFIG_ABYSS is not set
-# CONFIG_IBMLS is not set
-# CONFIG_PCMCIA_IBMTR is not set
-
CONFIG_NET_FC=y
@@ -1606,11 +1715,6 @@ CONFIG_NET_PCMCIA=y
CONFIG_PCMCIA_3C589=m
CONFIG_PCMCIA_3C574=m
CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
#
# Amateur Radio support
@@ -1618,27 +1722,9 @@ CONFIG_PCMCIA_AXNET=m
CONFIG_HAMRADIO=y
CONFIG_AX25=m
CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_CALC_BITTIMING=y
-CONFIG_CAN_SJA1000=m
-CONFIG_CAN_SJA1000_ISA=m
-CONFIG_CAN_SJA1000_PLATFORM=m
-CONFIG_CAN_EMS_PCI=m
-CONFIG_CAN_EMS_USB=m
-CONFIG_CAN_ESD_USB2=m
-CONFIG_CAN_KVASER_PCI=m
-CONFIG_CAN_PLX_PCI=m
-CONFIG_CAN_TSCAN1=m
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_SOFTING=m
-CONFIG_CAN_SOFTING_CS=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
-# CONFIG_PCH_CAN is not set
+
+# CONFIG_CAN is not set
+
CONFIG_NETROM=m
CONFIG_ROSE=m
CONFIG_MKISS=m
@@ -1654,7 +1740,7 @@ CONFIG_BAYCOM_PAR=m
CONFIG_BAYCOM_EPP=m
CONFIG_YAM=m
-CONFIG_NFC=m
+# CONFIG_NFC is not set
#
# IrDA (infrared) support
@@ -1887,6 +1973,7 @@ CONFIG_INPUT_CM109=m
CONFIG_INPUT_POLLDEV=m
CONFIG_INPUT_SPARSEKMAP=m
# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_BMA150 is not set
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
@@ -1989,6 +2076,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m
CONFIG_TOUCHSCREEN_MK712=m
CONFIG_TOUCHSCREEN_PENMOUNT=m
# CONFIG_TOUCHSCREEN_TPS6507X is not set
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
CONFIG_TOUCHSCREEN_TSC2007=m
CONFIG_TOUCHSCREEN_TOUCHIT213=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
@@ -2010,7 +2098,6 @@ CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_WISTRON_BTNS=m
CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE=m
CONFIG_INPUT_ATI_REMOTE2=m
CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -2065,6 +2152,7 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SERIAL_8250_DETECT_IRQ is not set
CONFIG_SERIAL_8250_RSA=y
+# CONFIG_SERIAL_8250_DW is not set
CONFIG_CYCLADES=m
# CONFIG_CYZ_INTR is not set
# CONFIG_MOXA_INTELLIO is not set
@@ -2274,12 +2362,14 @@ CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_ADM1275=m
CONFIG_SENSORS_UCD9000=m
CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
CONFIG_SENSORS_EMC6W201=m
CONFIG_PMBUS=m
CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_MAX16064=m
CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
CONFIG_SENSORS_MAX34440=m
CONFIG_SENSORS_MAX8688=m
CONFIG_SENSORS_MAX1668=m
@@ -2290,25 +2380,7 @@ CONFIG_SENSORS_MAX1668=m
# CONFIG_SERIAL_PCH_UART is not set
# CONFIG_USB_SWITCH_FSA9480 is not set
-CONFIG_W1=m
-CONFIG_W1_CON=y
-# This is busted.
-# If we enable it, it steals Matrox cards, and the
-# framebuffer drivers stop working.
-# CONFIG_W1_MASTER_MATROX is not set
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2408=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_BQ27000=m
+# CONFIG_W1 is not set
#
# Mice
@@ -2345,6 +2417,7 @@ CONFIG_MACHZ_WDT=m
# CONFIG_SC520_WDT is not set
CONFIG_ALIM7101_WDT=m
CONFIG_ALIM1535_WDT=m
+CONFIG_IT87_WDT=m
CONFIG_ITCO_WDT=m
CONFIG_ITCO_VENDOR_SUPPORT=y
# CONFIG_SC1200_WDT is not set
@@ -2358,12 +2431,15 @@ CONFIG_IT8712F_WDT=m
CONFIG_SMSC_SCH311X_WDT=m
CONFIG_W83977F_WDT=m
CONFIG_PCIPCWATCHDOG=m
+# CONFIG_PCWATCHDOG is not set
CONFIG_USBPCWATCHDOG=m
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
CONFIG_WM8350_WATCHDOG=m
CONFIG_WM831X_WATCHDOG=m
# CONFIG_MAX63XX_WATCHDOG is not set
# CONFIG_DW_WATCHDOG is not set
+CONFIG_W83697UG_WDT=m
+# CONFIG_WDT is not set
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2380,6 +2456,7 @@ CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
CONFIG_RTC_DRV_CMOS=y
CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1511=m
CONFIG_RTC_DRV_DS1553=m
CONFIG_RTC_DRV_DS1672=m
CONFIG_RTC_DRV_DS1742=m
@@ -2434,24 +2511,31 @@ CONFIG_AGP_SIS=y
CONFIG_AGP_SWORKS=y
CONFIG_AGP_VIA=y
CONFIG_AGP_EFFICEON=y
+
CONFIG_VGA_ARB=y
CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_STUB_POULSBO=m
+
+# CONFIG_STUB_POULSBO is not set
+
CONFIG_DRM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_R128 is not set
CONFIG_DRM_RADEON=m
CONFIG_DRM_RADEON_KMS=y
-CONFIG_DRM_I810=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_SAVAGE=m
+# CONFIG_DRM_I810 is not set
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_SIS is not set
+# CONFIG_DRM_SAVAGE is not set
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_VIA=m
+# CONFIG_DRM_VIA is not set
CONFIG_DRM_NOUVEAU=m
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_NOUVEAU_DEBUG=y
+CONFIG_DRM_PSB=m
+# CONFIG_DRM_PSB_MRST is not set
+# CONFIG_DRM_PSB_MFLD is not set
+# CONFIG_DRM_PSB_CDV is not set
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_SIL164=m
CONFIG_DRM_VMWGFX=m
@@ -2501,7 +2585,7 @@ CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_VIDEO_CPIA2=m
CONFIG_VIDEO_CQCAM=m
CONFIG_VIDEO_CX23885=m
-# CONFIG_MEDIA_ALTERA_CI is not set
+CONFIG_MEDIA_ALTERA_CI=m
CONFIG_VIDEO_CX18=m
CONFIG_VIDEO_CX18_ALSA=m
CONFIG_VIDEO_CX88=m
@@ -2523,6 +2607,7 @@ CONFIG_VIDEO_IVTV=m
CONFIG_VIDEO_MEYE=m
CONFIG_VIDEO_MXB=m
CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PMS is not set
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_SAA6588=m
CONFIG_VIDEO_SAA7134=m
@@ -2541,6 +2626,9 @@ CONFIG_VIDEO_ZORAN_LML33R10=m
CONFIG_VIDEO_ZORAN_ZR36060=m
CONFIG_VIDEO_FB_IVTV=m
CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
CONFIG_VIDEO_TLG2300=m
# CONFIG_VIDEO_TIMBERDALE is not set
# CONFIG_VIDEO_M5MOLS is not set
@@ -2668,6 +2756,13 @@ CONFIG_DVB_USB_ANYSEE=m
CONFIG_DVB_USB_DW2102=m
CONFIG_DVB_USB_FRIIO=m
CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_TDA10071=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_IT913X_FE=m
CONFIG_DVB_DM1105=m
CONFIG_DVB_S921=m
CONFIG_DVB_ISL6405=m
@@ -2747,6 +2842,7 @@ CONFIG_VIDEO_PVRUSB2_SYSFS=y
CONFIG_RC_CORE=m
CONFIG_RC_LOOPBACK=m
CONFIG_RC_MAP=m
+CONFIG_RC_ATI_REMOTE=m
CONFIG_IR_NEC_DECODER=m
CONFIG_IR_RC5_DECODER=m
CONFIG_IR_RC6_DECODER=m
@@ -2761,6 +2857,9 @@ CONFIG_IR_ITE_CIR=m
CONFIG_IR_NUVOTON=m
CONFIG_IR_FINTEK=m
CONFIG_IR_REDRAT3=m
+CONFIG_IR_ENE=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
@@ -2779,19 +2878,16 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
CONFIG_FB=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_3DFX_I2C=y
+# CONFIG_FB_3DFX is not set
# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_ATY_CT is not set
+# CONFIG_FB_ATY_GX is not set
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_CARMINE is not set
-CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_GEODE is not set
# CONFIG_FB_HECUBA is not set
@@ -2803,39 +2899,34 @@ CONFIG_FB_I810_I2C=y
# CONFIG_FB_INTEL is not set
# CONFIG_FB_INTEL_DEBUG is not set
# CONFIG_FB_INTEL_I2C is not set
-CONFIG_FB_KYRO=m
+# CONFIG_FB_KYRO is not set
# CONFIG_FB_LE80578 is not set
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_NVIDIA=m
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_MATROX_MILLENIUM is not set
+# CONFIG_FB_MATROX_MYSTIQUE is not set
+# CONFIG_FB_MATROX_G is not set
+# CONFIG_FB_MATROX_I2C is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_NVIDIA_I2C is not set
# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_I2C=y
# CONFIG_FB_PM2 is not set
# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
# CONFIG_FB_PM3 is not set
-CONFIG_FB_RADEON=m
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_RADEON_I2C is not set
# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA is not set
# CONFIG_FB_RIVA_DEBUG is not set
# CONFIG_FB_RIVA_I2C is not set
# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_S3=m
-CONFIG_FB_S3_DDC=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
# CONFIG_FB_SIS is not set
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_SM501=m
+# CONFIG_FB_SM501 is not set
+# CONFIG_FB_SMSCUFX is not set
CONFIG_FB_TILEBLITTING=y
-CONFIG_FB_TRIDENT=m
+# CONFIG_FB_TRIDENT is not set
# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
CONFIG_FB_VGA16=m
@@ -2843,14 +2934,14 @@ CONFIG_FB_VIRTUAL=m
CONFIG_FB_VOODOO1=m
# CONFIG_FB_VT8623 is not set
CONFIG_FB_EFI=y
-CONFIG_FB_VIA=m
-CONFIG_FB_VIA_X_COMPATIBILITY=y
+# CONFIG_FB_VIA is not set
# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-CONFIG_FB_METRONOME=m
+# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
# CONFIG_FB_PRE_INIT_FB is not set
# CONFIG_FB_TMIO is not set
# CONFIG_FB_BROADSHEET is not set
+CONFIG_FB_UDL=m
# CONFIG_FIRMWARE_EDID is not set
@@ -3032,9 +3123,7 @@ CONFIG_SND_USB_6FIRE=m
#
# PCMCIA devices
#
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_PCMCIA is not set
CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_SPEAKERS=m
@@ -3109,7 +3198,6 @@ CONFIG_USB_STORAGE_REALTEK=m
CONFIG_REALTEK_AUTOPM=y
CONFIG_USB_STORAGE_ENE_UB6250=m
# CONFIG_USB_LIBUSUAL is not set
-# uas is broken (#717633, #744099)
# CONFIG_USB_UAS is not set
@@ -3125,6 +3213,7 @@ CONFIG_HID=m
CONFIG_HIDRAW=y
CONFIG_HID_PID=y
CONFIG_LOGITECH_FF=y
+CONFIG_HID_LOGITECH_DJ=m
CONFIG_LOGIWII_FF=y
CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_PANTHERLORD_FF=y
@@ -3138,10 +3227,12 @@ CONFIG_DRAGONRISE_FF=y
CONFIG_GREENASIA_FF=y
CONFIG_SMARTJOYPLUS_FF=y
CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
CONFIG_HID_MAGICMOUSE=y
CONFIG_HID_MULTITOUCH=m
CONFIG_HID_NTRIG=y
CONFIG_HID_QUANTA=y
+CONFIG_HID_PRIMAX=m
CONFIG_HID_PRODIKEYS=m
CONFIG_HID_DRAGONRISE=m
CONFIG_HID_GYRATION=m
@@ -3218,6 +3309,7 @@ CONFIG_USB_GSPCA_SPCA561=m
CONFIG_USB_GSPCA_STK014=m
CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
CONFIG_USB_GSPCA_TV8532=m
CONFIG_USB_GSPCA_VC032X=m
CONFIG_USB_GSPCA_ZC3XX=m
@@ -3241,22 +3333,7 @@ CONFIG_USB_S2255=m
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_USB_SN9C102 is not set
CONFIG_USB_ZR364XX=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV9740=m
+# CONFIG_SOC_CAMERA is not set
#
# USB Network adaptors
@@ -3361,6 +3438,7 @@ CONFIG_USB_SERIAL_OTI6858=m
CONFIG_USB_SERIAL_OPTICON=m
CONFIG_USB_SERIAL_OMNINET=m
CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_QUATECH2 is not set
CONFIG_USB_SERIAL_SAFE=m
CONFIG_USB_SERIAL_SAFE_PADDED=y
CONFIG_USB_SERIAL_SIERRAWIRELESS=m
@@ -3401,6 +3479,7 @@ CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_FILE_STORAGE=m
# CONFIG_USB_FILE_STORAGE_TEST is not set
# CONFIG_USB_GADGET is not set
+# CONFIG_USB_DWC3 is not set
# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_ISP1760_HCD is not set
@@ -3482,6 +3561,11 @@ CONFIG_MFD_WM8400=m
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_WM831X_I2C is not set
# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_WL1273_CORE is not set
#
# File systems
@@ -3526,13 +3610,14 @@ CONFIG_DNOTIFY=y
# Autofsv3 is obsolete.
# systemd is dependant upon AUTOFS, so build it in.
CONFIG_AUTOFS4_FS=y
-CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_FS is not set
# CONFIG_EXOFS_DEBUG is not set
-CONFIG_NILFS2_FS=m
-CONFIG_LOGFS=m
+# CONFIG_NILFS2_FS is not set
+# CONFIG_LOGFS is not set
CONFIG_CEPH_FS=m
CONFIG_BLK_DEV_RBD=m
CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_FSCACHE=m
CONFIG_FSCACHE_STATS=y
@@ -3585,27 +3670,21 @@ CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m
CONFIG_BEFS_FS=m
# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_FS_POSIX_ACL=y
-CONFIG_JFFS2_FS_SECURITY=y
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=m
CONFIG_SQUASHFS_XATTR=y
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
CONFIG_SQUASHFS_ZLIB=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_VXFS_FS=m
+# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
-CONFIG_QNX4FS_FS=m
+# CONFIG_QNX4FS_FS is not set
CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
@@ -3614,7 +3693,7 @@ CONFIG_9P_FS=m
CONFIG_9P_FSCACHE=y
CONFIG_9P_FS_POSIX_ACL=y
CONFIG_FUSE_FS=m
-CONFIG_OMFS_FS=m
+# CONFIG_OMFS_FS is not set
CONFIG_CUSE=m
#
@@ -3684,10 +3763,7 @@ CONFIG_DLM_DEBUG=y
CONFIG_GFS2_FS=m
CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-# CONFIG_UBIFS_FS_DEBUG is not set
+# CONFIG_UBIFS_FS is not set
#
# Partition Types
@@ -3774,24 +3850,68 @@ CONFIG_FRAME_POINTER=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
# CONFIG_DEBUG_DRIVER is not set
CONFIG_HEADERS_CHECK=y
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_TRACE is not set
# CONFIG_LKDTM is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_LOCKDEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# DEBUG options that don't get enabled/disabled with 'make debug/release'
+#
+# Kmemleak still produces a lot of false positives.
+# CONFIG_DEBUG_KMEMLEAK is not set
+#
+# This generates a huge amount of dmesg spew
+# CONFIG_DEBUG_KOBJECT is not set
+#
+#
+# These debug options are deliberatly left on (even in 'make release' kernels).
+# They aren't that much of a performance impact, and the value
+# from getting useful bug-reports makes it worth leaving them on.
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_HIGHMEM=y
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
+CONFIG_DEBUG_RODATA_TEST=y
+CONFIG_DEBUG_NX_TEST=m
+CONFIG_DEBUG_SET_MODULE_RONX=y
+CONFIG_DEBUG_BOOT_PARAMS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+CONFIG_LOCKUP_DETECTOR=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_ATOMIC64_SELFTEST=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+CONFIG_LATENCYTOP=y
+CONFIG_RESOURCE_COUNTERS=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+CONFIG_EARLY_PRINTK_DBGP=y
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_CRASH is not set
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_RAMOOPS is not set
+
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
+
#
# Security options
#
CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
# CONFIG_SECURITY_DMESG_RESTRICT is not set
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
@@ -3803,6 +3923,7 @@ CONFIG_SECURITY_SELINUX_DEVELOP=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_AVC_STATS=y
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
# CONFIG_SECURITY_SMACK is not set
# CONFIG_SECURITY_TOMOYO is not set
# CONFIG_SECURITY_APPARMOR is not set
@@ -3877,6 +3998,9 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_DEV_HIFN_795X=m
CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_USER=m
+
+
# Random number generation
@@ -3889,6 +4013,7 @@ CONFIG_CRC_CCITT=m
CONFIG_CRC_ITU_T=m
CONFIG_CRC_T10DIF=m
CONFIG_CRC8=m
+# CONFIG_CRC7 is not set
CONFIG_CORDIC=m
CONFIG_CRYPTO_ZLIB=m
@@ -3925,6 +4050,7 @@ CONFIG_LCD_PLATFORM=m
CONFIG_SCHEDSTATS=y
CONFIG_SCHED_DEBUG=y
CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_SCHED_AUTOGROUP=y
@@ -3943,7 +4069,6 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y # XXX disabled by default, pass 'swapaccount'
# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
CONFIG_CGROUP_PERF=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
@@ -3958,6 +4083,8 @@ CONFIG_KEXEC=y
CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
+CONFIG_THERMAL_HWMON=y
+
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
@@ -3968,8 +4095,10 @@ CONFIG_IBMASR=m
CONFIG_PM_DEBUG=y
CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_PM_RUNTIME=y
+# CONFIG_PM_OPP is not set
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
@@ -3990,53 +4119,22 @@ CONFIG_I82365=m
# CONFIG_LTPC is not set
# CONFIG_COPS is not set
-CONFIG_SCSI_AHA152X=m
-CONFIG_SCSI_AHA1542=m
-# CONFIG_SCSI_IN2000 is not set
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ARCMSR_AER=y
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
# CONFIG_EL1 is not set
# CONFIG_EL2 is not set
-# CONFIG_ELPLUS is not set
-# CONFIG_EL16 is not set
CONFIG_EL3=m
# CONFIG_3C515 is not set
-# CONFIG_LANCE is not set
CONFIG_NET_VENDOR_SMC=y
# CONFIG_WD80x3 is not set
CONFIG_ULTRA=m
-# CONFIG_SMC9194 is not set
# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_NI52 is not set
# CONFIG_NI65 is not set
-# CONFIG_AT1700 is not set
# CONFIG_DEPCA is not set
CONFIG_NET_ISA=y
CONFIG_NE2000=m
# CONFIG_E2100 is not set
-CONFIG_EWRK3=m
-# CONFIG_EEXPRESS is not set
-# CONFIG_EEXPRESS_PRO is not set
# CONFIG_HPLAN_PLUS is not set
# CONFIG_HPLAN is not set
-# CONFIG_LP486E is not set
-# CONFIG_ETH16I is not set
-# CONFIG_ZNET is not set
-# CONFIG_SEEQ8005 is not set
-# CONFIG_AC3200 is not set
-# CONFIG_APRICOT is not set
-# CONFIG_CS89x0 is not set
# CONFIG_IBMTR is not set
# CONFIG_SKISA is not set
# CONFIG_PROTEON is not set
@@ -4069,24 +4167,7 @@ CONFIG_EWRK3=m
# CONFIG_SERIAL_8250_HUB6 is not set
# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
-# CONFIG_PCWATCHDOG is not set
-# CONFIG_WDT is not set
-
-# CONFIG_VIDEO_PMS is not set
-CONFIG_RADIO_ADAPTERS=y
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_RTRACK is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_SF16FMI is not set
-# CONFIG_RADIO_SF16FMR2 is not set
-# CONFIG_RADIO_TERRATEC is not set
-# CONFIG_RADIO_TRUST is not set
-# CONFIG_RADIO_TEA5764 is not set
-# CONFIG_RADIO_TYPHOON is not set
-# CONFIG_RADIO_ZOLTRIX is not set
-# CONFIG_RADIO_SAA7706H is not set
+# CONFIG_RADIO_ADAPTERS is not set
# CONFIG_SND_OPL4_LIB is not set
# CONFIG_SND_AD1816A is not set
@@ -4151,22 +4232,22 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
CONFIG_LEDS_ALIX2=m
-CONFIG_LEDS_WM8350=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_WM831X_STATUS=m
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LP3944=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_WM8350=m
+CONFIG_LEDS_WM831X_STATUS=m
CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
CONFIG_DW_DMAC=m
# CONFIG_TIMB_DMA is not set
-CONFIG_NET_DMA=y
# CONFIG_DMATEST is not set
CONFIG_ASYNC_TX_DMA=y
@@ -4187,13 +4268,14 @@ CONFIG_FUNCTION_PROFILER=y
CONFIG_RING_BUFFER_BENCHMARK=m
CONFIG_FUNCTION_TRACER=y
CONFIG_STACK_TRACER=y
+# CONFIG_FUNCTION_GRAPH_TRACER is not set
CONFIG_KPROBES=y
+CONFIG_KPROBE_EVENT=y
+# CONFIG_KPROBES_SANITY_TEST is not set
CONFIG_JUMP_LABEL=y
CONFIG_OPTPROBES=y
-# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
-
CONFIG_HZ_1000=y
CONFIG_TIMER_STATS=y
@@ -4209,22 +4291,26 @@ 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 is not set
+
# CONFIG_BATTERY_DS2760 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_BQ20Z75 is not set
# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_MAX8903 is not set
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_CHARGER_GPIO is not set
# CONFIG_BATTERY_MAX17042 is not set
+
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_PCF50633 is not set
+# CONFIG_PDA_POWER is not set
+
CONFIG_AUXDISPLAY=y
CONFIG_UIO=m
@@ -4236,7 +4322,6 @@ CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
# CONFIG_UIO_NETX is not set
-# CONFIG_CRC7 is not set
# LIRC
@@ -4256,30 +4341,17 @@ CONFIG_LIRC_TTUSBIR=m
# CONFIG_DEVKMEM is not set
-CONFIG_PM_TRACE_RTC=y
-CONFIG_R6040=m
-
CONFIG_BNX2X=m
CONFIG_SCSI_BNX2X_FCOE=m
CONFIG_NOZOMI=m
# CONFIG_TPS65010 is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_LATENCYTOP=y
-CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_COMPAT_BRK is not set
-
-#FIXME: x86 generic?
-CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_INPUT_APANEL=m
# CONFIG_INTEL_MENLOW is not set
CONFIG_ENCLOSURE_SERVICES=m
CONFIG_IPWIRELESS=m
-CONFIG_RTC_DRV_DS1511=m
# CONFIG_BLK_DEV_XIP is not set
CONFIG_MEMSTICK=m
@@ -4297,40 +4369,26 @@ CONFIG_A11Y_BRAILLE_CONSOLE=y
# MT9V022_PCA9536_SWITCH is not set
-CONFIG_THERMAL_HWMON=y
-
CONFIG_OPTIMIZE_INLINING=y
# FIXME: This should be x86/ia64 only
# CONFIG_HP_ILO is not set
# CONFIG_GPIOLIB is not set
-
-
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-
-CONFIG_IP_VS_IPV6=y
+# CONFIG_PINCTRL is not set
CONFIG_NET_DSA=y
CONFIG_NET_DSA_MV88E6060=y
CONFIG_NET_DSA_MV88E6131=y
CONFIG_NET_DSA_MV88E6123_61_65=y
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_ACT_SKBEDIT=m
+# Used by Maemo, we don't care.
+# CONFIG_PHONET is not set
-CONFIG_PHONET=m
+# CONFIG_ICS932S401 is not set
-CONFIG_ICS932S401=m
# CONFIG_C2PORT is not set
-
-CONFIG_IT87_WDT=m
-CONFIG_W83697UG_WDT=m
-
# CONFIG_REGULATOR is not set
# CONFIG_REGULATOR_DEBUG is not set
@@ -4350,9 +4408,9 @@ CONFIG_UWB_WHCI=m
CONFIG_UWB_I1480U=m
CONFIG_STAGING=y
+# CONFIG_STAGING_MEDIA 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
@@ -4379,7 +4437,6 @@ CONFIG_USB_ATMEL=m
# CONFIG_RTL8192E is not set
# CONFIG_INPUT_GPIO is not set
# CONFIG_VIDEO_CX25821 is not set
-# CONFIG_HYPERV is not set
# CONFIG_R8187SE is not set
# CONFIG_RTL8192U is not set
# CONFIG_BATMAN_ADV is not set
@@ -4399,51 +4456,41 @@ CONFIG_USB_ATMEL=m
# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
# CONFIG_RTS_PSTOR is not set
-# CONFIG_DRM_PSB is not set
-# CONFIG_ALTERA_STAPL is not set
+CONFIG_ALTERA_STAPL=m
# CONFIG_DVB_CXD2099 is not set
# CONFIG_USBIP_CORE is not set
# CONFIG_INTEL_MEI is not set
# CONFIG_ZCACHE is not set
-
-#
-# Android
+# CONFIG_RTS5139 is not set
+# CONFIG_NVEC_LEDS is not set
+# CONFIG_VT6655 is not set
#
+# END OF STAGING
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_FUNCTION_GRAPH_TRACER is not set
-CONFIG_EARLY_PRINTK_DBGP=y
-
-CONFIG_SECURITYFS=y
-
-CONFIG_SCSI_CXGB3_ISCSI=m
CONFIG_LIBFC=m
CONFIG_LIBFCOE=m
CONFIG_FCOE=m
CONFIG_FCOE_FNIC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
CONFIG_NOP_USB_XCEIV=m
-CONFIG_IMA=y
+# CONFIG_IMA is not set
CONFIG_IMA_MEASURE_PCR_IDX=10
CONFIG_IMA_AUDIT=y
CONFIG_IMA_LSM_RULES=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
-
-# CONFIG_PAGE_POISONING is not set
-
+# CONFIG_EVM is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRASH is not set
+CONFIG_LSM_MMAP_MIN_ADDR=65536
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_RCU_FAST_NO_HZ=y
CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_SPARSE_RCU_POINTER=y
CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -4453,62 +4500,29 @@ CONFIG_FANOTIFY=y
CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
CONFIG_IEEE802154_DRIVERS=m
CONFIG_IEEE802154_FAKEHARD=m
-# CONFIG_GCOV_KERNEL is not set
-
CONFIG_PPS=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
# CONFIG_PPS_DEBUG is not set
CONFIG_PPS_CLIENT_PARPORT=m
CONFIG_PPS_GENERATOR_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
CONFIG_NTP_PPS=y
CONFIG_PTP_1588_CLOCK=m
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_VT6655 is not set
-CONFIG_FB_UDL=m
-
-# DEBUG options that don't get enabled/disabled with 'make debug/release'
-#
-# Kmemleak still produces a lot of false positives.
-# CONFIG_DEBUG_KMEMLEAK is not set
-#
-# This generates a huge amount of dmesg spew
-# CONFIG_DEBUG_KOBJECT is not set
-#
-#
-# These debug options are deliberatly left on (even in 'make release' kernels).
-# They aren't that much of a performance impact, and the value
-# from getting useful bug-reports makes it worth leaving them on.
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DEBUG_HIGHMEM=y
-CONFIG_BOOT_PRINTK_DELAY=y
-CONFIG_DEBUG_LIST=y
-CONFIG_DEBUG_SHIRQ=y
-CONFIG_DEBUG_DEVRES=y
-CONFIG_DEBUG_RODATA_TEST=y
-CONFIG_DEBUG_NX_TEST=m
-CONFIG_DEBUG_BOOT_PARAMS=y
-CONFIG_LOCKUP_DETECTOR=y
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_ATOMIC64_SELFTEST=y
-
-CONFIG_MEMORY_FAILURE=y
-CONFIG_HWPOISON_INJECT=m
CONFIG_CLEANCACHE=y
-CONFIG_BLK_DEV_DRBD=m
-
# CONFIG_MDIO_GPIO is not set
# CONFIG_KEYBOARD_GPIO is not set
# CONFIG_KEYBOARD_GPIO_POLLED is not set
# CONFIG_MOUSE_GPIO is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DESIGNWARE_PCI is not set
# CONFIG_I2C_GPIO is not set
# CONFIG_DEBUG_GPIO is not set
# CONFIG_W1_MASTER_GPIO is not set
@@ -4532,32 +4546,14 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_GPIO_PCH is not set
# CONFIG_GPIO_ML_IOH is not set
-CONFIG_KPROBE_EVENT=y
-
-# CONFIG_RAMOOPS is not set
-
-CONFIG_IR_ENE=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-
# CONFIG_GPIO_SX150X is not set
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_MFD_TC3589X is not set
-
-CONFIG_SPARSE_RCU_POINTER=y
-
-# CONFIG_PM_OPP is not set
-
+# FIXME: Why?
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
+CONFIG_TEST_KSTRTOX=y
# CONFIG_XZ_DEC_TEST is not set
-CONFIG_PN544_NFC=m
-CONFIG_NFC_PN533=m
-
CONFIG_TARGET_CORE=m
CONFIG_ISCSI_TARGET=m
CONFIG_LOOPBACK_TARGET=m
@@ -4576,8 +4572,6 @@ CONFIG_PSTORE=y
CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_TEST_KSTRTOX=m
-
CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
@@ -4586,6 +4580,6 @@ CONFIG_BCMA_HOST_PCI=y
# CONFIG_GOOGLE_FIRMWARE is not set
CONFIG_INTEL_MID_PTI=m
-
CONFIG_IOMMU_SUPPORT=y
+# CONFIG_PM_DEVFREQ is not set
diff --git a/config-nodebug b/config-nodebug
index 084f88e..0f70aa0 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -24,6 +24,7 @@ CONFIG_CPUMASK_OFFSTACK=y
# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
# CONFIG_FAIL_IO_TIMEOUT is not set
+# CONFIG_FAIL_MMC_REQUEST is not set
# CONFIG_SLUB_DEBUG_ON is not set
@@ -81,7 +82,6 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
# CONFIG_IWLWIFI_DEVICE_TRACING is not set
# CONFIG_DEBUG_OBJECTS_WORK is not set
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
# CONFIG_DMADEVICES_DEBUG is not set
# CONFIG_DMADEVICES_VDEBUG is not set
@@ -99,9 +99,8 @@ CONFIG_KDB_KEYBOARD=y
# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set
# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
-
# CONFIG_DETECT_HUNG_TASK is not set
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
diff --git a/config-powerpc-generic b/config-powerpc-generic
index 5ecaf0e..2ca0c3e 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -43,11 +43,11 @@ CONFIG_FB_MATROX=y
CONFIG_FB_ATY128_BACKLIGHT=y
CONFIG_FB_ATY_BACKLIGHT=y
CONFIG_FB_RIVA_BACKLIGHT=y
-# FIXME: Do we care about this hardware ?
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_MB862XX_LIME=y
-CONFIG_FB_MB862XX_I2C=y
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_MB862XX_PCI_GDC is not set
+# CONFIG_FB_MB862XX_LIME is not set
+# CONFIG_FB_MB862XX_I2C is not set
+
CONFIG_SND_POWERMAC=m
CONFIG_SND_POWERMAC_AUTO_DRC=y
@@ -182,8 +182,8 @@ CONFIG_EDAC_PASEMI=m
CONFIG_EDAC_AMD8131=m
CONFIG_EDAC_AMD8111=m
-CONFIG_AXON_RAM=m
-CONFIG_OPROFILE_CELL=y
+# CONFIG_AXON_RAM is not set
+# CONFIG_OPROFILE_CELL is not set
CONFIG_SUSPEND_FREEZER=y
# CONFIG_IDEPCI_PCIBUS_ORDER is not set
@@ -204,9 +204,9 @@ CONFIG_DMADEVICES=y
CONFIG_SND_PPC=y
-CONFIG_PPC_82xx=y
-CONFIG_PPC_83xx=y
-CONFIG_PPC_86xx=y
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
CONFIG_EXTRA_TARGETS=""
# CONFIG_CODE_PATCHING_SELFTEST is not set
# CONFIG_FTR_FIXUP_SELFTEST is not set
@@ -220,27 +220,28 @@ CONFIG_EXTRA_TARGETS=""
# CONFIG_SERIAL_QE is not set
# CONFIG_I2C_CPM is not set
+CONFIG_NET_VENDOR_IBM=y
-CONFIG_SERIO_XILINX_XPS_PS2=m
+# CONFIG_SERIO_XILINX_XPS_PS2 is not set
# CONFIG_PPC_SMLPAR is not set
-CONFIG_MGCOGE=y
-CONFIG_GEF_SBC610=y
-CONFIG_GEF_PPC9A=y
-CONFIG_GEF_SBC310=y
+# CONFIG_MGCOGE is not set
+# CONFIG_GEF_SBC610 is not set
+# CONFIG_GEF_PPC9A is not set
+# CONFIG_GEF_SBC310 is not set
-CONFIG_QUICC_ENGINE=y
-CONFIG_QE_GPIO=y
-CONFIG_MPC8xxx_GPIO=y
+# CONFIG_QUICC_ENGINE is not set
+# CONFIG_QE_GPIO is not set
+# CONFIG_MPC8xxx_GPIO is not set
CONFIG_IDE_GD=y
CONFIG_IDE_GD_ATA=y
CONFIG_IDE_GD_ATAPI=y
-CONFIG_MCU_MPC8349EMITX=m
+# CONFIG_MCU_MPC8349EMITX is not set
-CONFIG_GPIO_XILINX=y
+# CONFIG_GPIO_XILINX is not set
CONFIG_PMIC_DA903X=y
CONFIG_BACKLIGHT_DA903X=m
@@ -261,11 +262,11 @@ CONFIG_TOUCHSCREEN_DA9034=m
CONFIG_SIMPLE_GPIO=y
-CONFIG_FSL_PQ_MDIO=m
+# CONFIG_FSL_PQ_MDIO is not set
-CONFIG_PS3_VRAM=m
+# CONFIG_PS3_VRAM is not set
CONFIG_MDIO_GPIO=m
-CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL=m
+# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_PCA953X=m
CONFIG_GPIO_PCF857X=m
@@ -293,20 +294,20 @@ CONFIG_SWIOTLB=y
CONFIG_PPC_DISABLE_WERROR=y
-CONFIG_XILINX_LL_TEMAC=m
-CONFIG_XILINX_EMACLITE=m
+# CONFIG_XILINX_LL_TEMAC is not set
+# CONFIG_XILINX_EMACLITE is not set
CONFIG_GPIO_WM831X=m
# CONFIG_GPIO_LANGWELL is not set
# CONFIG_GPIO_UCB1400 is not set
-CONFIG_EDAC_MPC85XX=m
+# CONFIG_EDAC_MPC85XX is not set
CONFIG_NR_IRQS=512
CONFIG_SPARSE_IRQ=y
-CONFIG_PPC_MPC5200_LPBFIFO=m
-CONFIG_CAN_MSCAN=m
-CONFIG_CAN_MPC5XXX=m
+# CONFIG_PPC_MPC5200_LPBFIFO is not set
+# CONFIG_CAN_MSCAN is not set
+# CONFIG_CAN_MPC5XXX is not set
CONFIG_PATA_MACIO=m
CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
# CONFIG_PMIC_ADP5520 is not set
@@ -327,7 +328,7 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
# CONFIG_PPC_MPC512x is not set
# CONFIG_RTC_DRV_MPC5121 is not set
-CONFIG_MPC512X_DMA=m
+# CONFIG_MPC512X_DMA is not set
CONFIG_KVM_GUEST=y
@@ -338,15 +339,17 @@ CONFIG_I2C_MPC=m
CONFIG_RFKILL_GPIO=m
-CONFIG_CRYPTO_DEV_FSL_CAAM=m
-CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
-CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255
-CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048
-CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_CAN_FLEXCAN is not set
+# CONFIG_NET_VENDOR_XILINX is not set
+# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
+# CONFIG_IBM_EMAC is not set
+# CONFIG_NET_VENDOR_PASEMI is not set
+# CONFIG_NET_VENDOR_TOSHIBA is not set
+
# Disable btrfs until it is shown to work with 64k pages (rhbz 747079)
# CONFIG_BTRFS_FS is not set
diff --git a/config-powerpc32-generic b/config-powerpc32-generic
index 31c399e..e856b9f 100644
--- a/config-powerpc32-generic
+++ b/config-powerpc32-generic
@@ -7,17 +7,17 @@ CONFIG_PPC32=y
CONFIG_CPU_FREQ_PMAC=y
CONFIG_PPC_CHRP=y
CONFIG_PPC_PMAC=y
-CONFIG_PPC_MPC52xx=y
+# CONFIG_PPC_MPC52xx is not set
CONFIG_PPC_PREP=y
# CONFIG_PPC_MPC5200_SIMPLE is not set
-CONFIG_SATA_FSL=m
+# CONFIG_SATA_FSL is not set
# CONFIG_SATA_NV is not set
# busted in .28git1
# ERROR: "cacheable_memzero" [drivers/net/gianfar_driver.ko] undefined!
# CONFIG_GIANFAR is not set
-CONFIG_USB_EHCI_FSL=y
+# CONFIG_USB_EHCI_FSL is not set
CONFIG_PMAC_APM_EMU=y
CONFIG_PMAC_BACKLIGHT=y
@@ -41,6 +41,7 @@ CONFIG_ADB_PMU_LED=y
CONFIG_ADB_PMU_LED_IDE=y
CONFIG_PMAC_MEDIABAY=y
+CONFIG_NET_VENDOR_APPLE=y
CONFIG_BMAC=m
CONFIG_MACE=m
# CONFIG_MACE_AAUI_PORT is not set
@@ -72,24 +73,20 @@ CONFIG_BRIQ_PANEL=m
# CONFIG_ATA_PIIX is not set
# CONFIG_PATA_AMD is not set
# CONFIG_PATA_ATIIXP is not set
-CONFIG_PATA_MPC52xx=m
+# CONFIG_PATA_MPC52xx is not set
# CONFIG_PATA_MPIIX is not set
# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_OPTI is not set
# CONFIG_PATA_SERVERWORKS is not set
-CONFIG_SERIAL_MPC52xx=y
-CONFIG_SERIAL_MPC52xx_CONSOLE=y
-CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
+# CONFIG_SERIAL_MPC52xx is not set
# CONFIG_MPC5200_WDT is not set
CONFIG_8xxx_WDT=m
CONFIG_GEF_WDT=m
-CONFIG_PPC_MPC5200_BUGFIX=y
-CONFIG_FEC_MPC52xx=m
+# CONFIG_PPC_MPC5200_BUGFIX is not set
+# CONFIG_NET_VENDOR_FREESCALE is not set
#CHECK: This may later become a tristate.
-CONFIG_FEC_MPC52xx_MDIO=y
-CONFIG_PPC_MPC5200_GPIO=y
CONFIG_MDIO_GPIO=m
CONFIG_SERIAL_OF_PLATFORM=y
@@ -144,26 +141,28 @@ CONFIG_VIRTUALIZATION=y
CONFIG_SND_ISA=y
CONFIG_CRYPTO_DEV_TALITOS=m
-CONFIG_FSL_EMB_PERFMON=y
-CONFIG_MPC8272_ADS=y
-CONFIG_PQ2FADS=y
-CONFIG_EP8248E=y
-CONFIG_MPC830x_RDB=y
-CONFIG_MPC831x_RDB=y
-CONFIG_MPC832x_MDS=y
-CONFIG_MPC832x_RDB=y
-CONFIG_MPC834x_MDS=y
-CONFIG_MPC834x_ITX=y
-CONFIG_MPC836x_MDS=y
-CONFIG_MPC836x_RDK=y
-CONFIG_MPC837x_MDS=y
-CONFIG_MPC837x_RDB=y
-CONFIG_SBC834x=y
-CONFIG_ASP834x=y
-CONFIG_KMETER1=y
-CONFIG_MPC8641_HPCN=y
-CONFIG_SBC8641D=y
-CONFIG_MPC8610_HPCD=y
+# CONFIG_FSL_EMB_PERFMON is not set
+# CONFIG_MPC8272_ADS is not set
+# CONFIG_PQ2FADS is not set
+# CONFIG_EP8248E is not set
+# CONFIG_MPC830x_RDB is not set
+# CONFIG_MPC831x_RDB is not set
+# CONFIG_MPC832x_MDS is not set
+# CONFIG_MPC832x_RDB is not set
+# CONFIG_MPC834x_MDS is not set
+# CONFIG_MPC834x_ITX is not set
+# CONFIG_MPC836x_MDS is not set
+# CONFIG_MPC836x_RDK is not set
+# CONFIG_MPC837x_MDS is not set
+# CONFIG_MPC837x_RDB is not set
+# CONFIG_SBC834x is not set
+# CONFIG_ASP834x is not set
+# CONFIG_KMETER1 is not set
+# CONFIG_MPC8641_HPCN is not set
+# CONFIG_SBC8641D is not set
+# CONFIG_MPC8610_HPCD is not set
+# CONFIG_FSL_LBC is not set
+# CONFIG_MTD_NAND_FSL_UPM is not set
# CONFIG_USB_MUSB_HDRC is not set
@@ -172,8 +171,6 @@ CONFIG_MPC8610_HPCD=y
# drivers/mtd/maps/sbc8240.c:172: warning: passing argument 1 of 'simple_map_init' from incompatible pointer type
# drivers/mtd/maps/sbc8240.c:177: error: 'struct mtd_info' has no member named 'module'
-CONFIG_MTD_NAND_FSL_UPM=m
-
CONFIG_RCU_FANOUT=32
CONFIG_PERF_COUNTERS=y
@@ -185,3 +182,4 @@ CONFIG_KVM_BOOK3S_32=m
# CONFIG_SCSI_QLA_ISCSI is not set
CONFIG_BATTERY_PMU=m
+
diff --git a/config-powerpc64 b/config-powerpc64
index 29ea232..42b5016 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -2,42 +2,23 @@ CONFIG_WINDFARM_PM81=y
CONFIG_WINDFARM_PM91=y
CONFIG_WINDFARM_PM121=y
CONFIG_PPC_PMAC64=y
-CONFIG_PPC_MAPLE=y
-CONFIG_PPC_CELL=y
-CONFIG_PPC_IBM_CELL_BLADE=y
+# CONFIG_PPC_MAPLE is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_IBM_CELL_BLADE is not set
CONFIG_PPC_ISERIES=y
CONFIG_PPC_PSERIES=y
CONFIG_PPC_PMAC=y
-CONFIG_PPC_PASEMI=y
+CONFIG_PPC_POWERNV=y
+CONFIG_PPC_POWERNV_RTAS=y
+# CONFIG_PPC_PASEMI is not set
# CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
-CONFIG_PPC_PS3=y
-CONFIG_PPC_CELLEB=y
-CONFIG_PPC_CELL_QPACE=y
-CONFIG_PS3_HTAB_SIZE=20
-# CONFIG_PS3_DYNAMIC_DMA is not set
-CONFIG_PS3_ADVANCED=y
-CONFIG_PS3_HTAB_SIZE=20
-# CONFIG_PS3_DYNAMIC_DMA is not set
-CONFIG_PS3_VUART=y
-CONFIG_PS3_PS3AV=y
-CONFIG_PS3_STORAGE=m
-CONFIG_PS3_DISK=m
-CONFIG_PS3_ROM=m
-CONFIG_PS3_FLASH=m
-CONFIG_PS3_LPM=y
-CONFIG_SND_PS3=m
-CONFIG_SND_PS3_DEFAULT_START_DELAY=1000
-CONFIG_GELIC_NET=m
-CONFIG_GELIC_WIRELESS=y
-CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE=y
-CONFIG_CBE_THERM=m
-CONFIG_CBE_CPUFREQ=m
-CONFIG_CBE_CPUFREQ_PMI=m
-CONFIG_CBE_CPUFREQ_PMI_ENABLE=y
+# CONFIG_PPC_PS3 is not set
+# CONFIG_PPC_CELLEB is not set
+# CONFIG_PPC_CELL_QPACE is not set
CONFIG_PMAC_RACKMETER=m
CONFIG_IBMEBUS=y
-CONFIG_SPU_FS=m
CONFIG_RTAS_FLASH=y
+# CONFIG_UDBG_RTAS_CONSOLE is not set
CONFIG_PPC_SPLPAR=y
CONFIG_SCANLOG=y
CONFIG_LPARCFG=y
@@ -60,10 +41,9 @@ CONFIG_CPU_FREQ_PMAC64=y
CONFIG_SCSI_IPR=m
CONFIG_SCSI_IPR_TRACE=y
CONFIG_SCSI_IPR_DUMP=y
-CONFIG_SPIDER_NET=m
CONFIG_HVC_RTAS=y
CONFIG_HVC_ISERIES=y
-CONFIG_CBE_RAS=y
+CONFIG_HVC_OPAL=y
# iSeries device drivers
#
@@ -75,19 +55,13 @@ CONFIG_VIOTAPE=m
CONFIG_PASEMI_MAC=m
CONFIG_SERIAL_OF_PLATFORM=m
-CONFIG_PPC_PASEMI_IOMMU=y
CONFIG_SERIAL_TXX9=y
CONFIG_SERIAL_TXX9_NR_UARTS=6
CONFIG_SERIAL_TXX9_CONSOLE=y
CONFIG_HVC_BEAT=y
-CONFIG_FB_PS3=y
-CONFIG_FB_PS3_DEFAULT_SIZE_M=18
-
CONFIG_PPC_PMI=m
-CONFIG_PS3_SYS_MANAGER=y
-# CONFIG_BLK_DEV_CELLEB is not set
CONFIG_PATA_SCC=m
@@ -138,19 +112,9 @@ CONFIG_SECCOMP=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
# CONFIG_BLK_DEV_PLATFORM is not set
-CONFIG_IBM_NEW_EMAC=m
-CONFIG_IBM_NEW_EMAC_RXB=128
-CONFIG_IBM_NEW_EMAC_TXB=64
-CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-# CONFIG_IBM_NEW_EMAC_DEBUG is not set
# CONFIG_VIRQ_DEBUG is not set
-CONFIG_ELECTRA_CF=m
-CONFIG_MTD_NAND_PASEMI=m
-CONFIG_EDAC_CELL=m
CONFIG_EDAC_CPC925=m
CONFIG_FRAME_WARN=2048
@@ -164,14 +128,6 @@ CONFIG_SCSI_IBMVFC=m
# CONFIG_SCSI_IBMVFC_TRACE is not set
CONFIG_IBM_BSR=m
-CONFIG_SERIO_XILINX_XPS_PS2=m
-
-CONFIG_PPC_IBM_CELL_RESETBUTTON=y
-CONFIG_PPC_IBM_CELL_POWERBUTTON=m
-CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
-
-CONFIG_RTC_DRV_PS3=y
-
CONFIG_CRASH_DUMP=y
CONFIG_RELOCATABLE=y
@@ -202,4 +158,3 @@ CONFIG_IO_EVENT_IRQ=y
CONFIG_HW_RANDOM_AMD=m
CONFIG_BPF_JIT=y
-CONFIG_CPU_FREQ_MAPLE=y
diff --git a/config-s390x b/config-s390x
index 5251b5b..f039421 100644
--- a/config-s390x
+++ b/config-s390x
@@ -237,3 +237,5 @@ CONFIG_STRICT_DEVMEM=y
# CONFIG_WARN_DYNAMIC_STACK is not set
CONFIG_CRYPTO_GHASH_S390=m
+CONFIG_NET_CORE=y
+CONFIG_ETHERNET=y
diff --git a/config-sparc64-generic b/config-sparc64-generic
index e5ee2c4..e9b66f6 100644
--- a/config-sparc64-generic
+++ b/config-sparc64-generic
@@ -43,6 +43,7 @@ CONFIG_I2C_ALI1535=m
# CONFIG_VGASTATE is not set
# CONFIG_FB_DDC is not set
# CONFIG_FB_BW2 is not set
+# CONFIG_FB_GRVGA is not set
CONFIG_FB_CG3=y
CONFIG_FB_CG6=y
# CONFIG_FB_RIVA is not set
diff --git a/config-x86-32-generic b/config-x86-32-generic
index caeae93..3b55ae5 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -57,9 +57,6 @@ CONFIG_FB_GEODE_GX=y
# CONFIG_PCI_GOMMCONFIG is not set
CONFIG_PCI_GOANY=y
-# FIXME: wtf? "x86 specific drivers"
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_SCSI_FUTURE_DOMAIN=m
CONFIG_IBM_ASM=m
#
@@ -138,8 +135,6 @@ CONFIG_CRYPTO_TWOFISH_586=m
CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VMI=y
-
CONFIG_XEN_MAX_DOMAIN_MEMORY=8
CONFIG_MTD_NAND_CAFE=m
@@ -155,6 +150,7 @@ CONFIG_OLPC_XO1_PM=y
CONFIG_OLPC_XO15_SCI=y
CONFIG_OLPC_XO1_RTC=y
CONFIG_OLPC_XO1_SCI=y
+# CONFIG_ALIX is not set
# staging
# CONFIG_FB_OLPC_DCON is not set
@@ -204,3 +200,6 @@ CONFIG_I2O_EXT_ADAPTEC=y
CONFIG_I2O_CONFIG_OLD_IOCTL=y
CONFIG_I2O_BUS=m
+# CONFIG_EDAC_SBRIDGE is not set
+
+# CONFIG_X86_WANT_INTEL_MID is not set
diff --git a/config-x86-generic b/config-x86-generic
index 45fda3b..fec30ea 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -36,10 +36,10 @@ CONFIG_FB_EFI=y
# FIXME: 32bit only?
# CONFIG_FB_N411 is not set
-CONFIG_DMAR=y
+CONFIG_INTEL_IOMMU=y
CONFIG_DMAR_BROKEN_GFX_WA=y
-CONFIG_DMAR_FLOPPY_WA=y
-# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
CONFIG_SCSI_ADVANSYS=m
CONFIG_SECCOMP=y
@@ -59,7 +59,6 @@ CONFIG_DEBUG_STACKOVERFLOW=y
CONFIG_ACPI=y
CONFIG_ACPI_AC=y
# CONFIG_ACPI_ASUS is not set
-CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_BATTERY=y
CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_CONTAINER=m
@@ -73,6 +72,8 @@ CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_THERMAL=y
CONFIG_ACPI_TOSHIBA=m
CONFIG_ACPI_VIDEO=m
+# FIXME: Next two are deprecated. Remove them when they disappear upstream
+# CONFIG_ACPI_PROCFS_POWER is not set
# CONFIG_ACPI_PROC_EVENT is not set
CONFIG_PNPACPI=y
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
@@ -227,8 +228,7 @@ CONFIG_PARAVIRT=y
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
# CONFIG_PARAVIRT_DEBUG is not set
-# PARAVIRT_SPINLOCKS has a 5% perf hit
-# FIXME: Still true ? References?
+# PARAVIRT_SPINLOCKS has a 5% perf hit on native hw (see kconfig)
# CONFIG_PARAVIRT_SPINLOCKS is not set
CONFIG_KVM_CLOCK=y
@@ -310,7 +310,7 @@ CONFIG_HP_ILO=m
CONFIG_BACKLIGHT_APPLE=m
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
# CONFIG_CMDLINE_BOOL is not set
@@ -381,3 +381,6 @@ CONFIG_HP_ACCEL=m
CONFIG_SCHED_SMT=y
CONFIG_CC_STACKPROTECTOR=y
CONFIG_RELOCATABLE=y
+
+# CONFIG_HYPERV is not set
+
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 693c3a8..f5b440a 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -22,8 +22,7 @@ CONFIG_AMD_IOMMU=y
CONFIG_AMD_IOMMU_STATS=y
# CONFIG_IOMMU_DEBUG is not set
CONFIG_SWIOTLB=y
-CONFIG_CALGARY_IOMMU=y
-CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+# CONFIG_CALGARY_IOMMU is not set
CONFIG_KEXEC_JUMP=y
@@ -44,6 +43,9 @@ CONFIG_CRYPTO_AES_X86_64=y
CONFIG_CRYPTO_TWOFISH_X86_64=m
CONFIG_CRYPTO_SALSA20_X86_64=m
CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
# CONFIG_I2C_ALI1535 is not set
# CONFIG_I2C_ALI1563 is not set
@@ -53,6 +55,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
CONFIG_EDAC_AMD64=m
# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
+CONFIG_EDAC_SBRIDGE=m
# CONFIG_PC8736x_GPIO is not set
@@ -62,8 +65,8 @@ CONFIG_SPARSEMEM=y
CONFIG_HAVE_MEMORY_PRESENT=y
CONFIG_SPARSEMEM_EXTREME=y
CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTREMOVE=y
+# CONFIG_MEMORY_HOTPLUG is not set
+# CONFIG_MEMORY_HOTREMOVE is not set
# CONFIG_BLK_DEV_CMD640 is not set
# CONFIG_BLK_DEV_RZ1000 is not set
@@ -79,7 +82,7 @@ CONFIG_SGI_GRU=m
# CONFIG_VIDEO_CAFE_CCIC is not set
-CONFIG_XEN_MAX_DOMAIN_MEMORY=32
+CONFIG_XEN_MAX_DOMAIN_MEMORY=128
# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set
CONFIG_XEN_DEV_EVTCHN=m
CONFIG_XEN_SYS_HYPERVISOR=y
@@ -95,7 +98,7 @@ CONFIG_DIRECT_GBPAGES=y
CONFIG_X86_MPPARSE=y
CONFIG_I7300_IDLE=m
-CONFIG_INTR_REMAP=y
+CONFIG_IRQ_REMAP=y
CONFIG_X86_X2APIC=y
CONFIG_SPARSE_IRQ=y
diff --git a/epoll-limit-paths.patch b/epoll-limit-paths.patch
index 440db27..4ed306a 100644
--- a/epoll-limit-paths.patch
+++ b/epoll-limit-paths.patch
@@ -1,4 +1,4 @@
-From 6a4ca79652219cf22da800d990e5b46feaea1ad9 Mon Sep 17 00:00:00 2001
+From 0a6cc45426fe3baaf231efd7efe4300fd879efc8 Mon Sep 17 00:00:00 2001
From: Jason Baron <jbaron at redhat.com>
Date: Mon, 24 Oct 2011 14:59:02 +1100
Subject: [PATCH] epoll: limit paths
@@ -91,7 +91,7 @@ Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
3 files changed, 203 insertions(+), 25 deletions(-)
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
-index 4a53743..414ac74 100644
+index b84fad9..414ac74 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -197,6 +197,12 @@ struct eventpoll {
@@ -137,7 +137,7 @@ index 4a53743..414ac74 100644
.llseek = noop_llseek,
};
--/* Fast test to see if the file is an evenpoll file */
+-/* Fast test to see if the file is an eventpoll file */
-static inline int is_file_epoll(struct file *f)
-{
- return f->f_op == &eventpoll_fops;
@@ -449,7 +449,7 @@ index f362733..657ab55 100644
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 277f497..93778e0 100644
+index ba98668..d393a68 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -985,6 +985,7 @@ struct file {
diff --git a/kernel.spec b/kernel.spec
index 4c328ea..1d03eda 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,19 +54,19 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 2
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
# on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
# which yields a base_sublevel of 21.
-%define base_sublevel 1
+%define base_sublevel 2
## If this is a released kernel ##
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 10
+%define stable_update 1
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -215,7 +215,7 @@ Summary: The Linux kernel
#
# (Uncomment the '#' and both spaces below to disable with_backports.)
#
-# % define with_backports 0
+%define with_backports 0
#######################################################################
%define make_target bzImage
@@ -410,13 +410,6 @@ Summary: The Linux kernel
%define kernel_image_elf 1
%endif
-%ifarch ia64
-%define all_arch_configs kernel-%{version}-ia64*.config
-%define image_install_path boot/efi/EFI/redhat
-%define make_target compressed
-%define kernel_image vmlinux.gz
-%endif
-
%ifarch alpha alphaev56
%define all_arch_configs kernel-%{version}-alpha*.config
%define image_install_path boot
@@ -555,7 +548,7 @@ Version: %{rpmversion}
Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 %{sparc} s390 s390x alpha alphaev56 %{arm}
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 %{sparc} s390 s390x alpha alphaev56 %{arm}
ExclusiveOS: Linux
%kernel_reqprovconf
@@ -564,7 +557,7 @@ ExclusiveOS: Linux
# List the packages used during the kernel build
#
BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar
-BuildRequires: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk
+BuildRequires: bzip2, xz, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk
BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
BuildRequires: net-tools
BuildRequires: xmlto, asciidoc
@@ -589,7 +582,7 @@ BuildRequires: rpm-build >= 4.4.2.1-4
%define debuginfo_args --strict-build-id
%endif
-Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-%{kversion}.tar.bz2
+Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-%{kversion}.tar.xz
Source1: compat-wireless-%{cwversion}.tar.bz2
Source11: genkey
@@ -613,8 +606,6 @@ Source51: config-powerpc32-generic
Source52: config-powerpc32-smp
Source53: config-powerpc64
-Source60: config-ia64-generic
-
Source70: config-s390x
Source90: config-sparc64-generic
@@ -641,11 +632,11 @@ Source2001: cpupower.config
# For a stable release kernel
%if 0%{?stable_update}
%if 0%{?stable_base}
-%define stable_patch_00 patch-3.%{base_sublevel}.%{stable_base}.bz2
+%define stable_patch_00 patch-3.%{base_sublevel}.%{stable_base}.xz
Patch00: %{stable_patch_00}
%endif
%if 0%{?stable_rc}
-%define stable_patch_01 patch-3.%{base_sublevel}.%{stable_update}-rc%{stable_rc}.bz2
+%define stable_patch_01 patch-3.%{base_sublevel}.%{stable_update}-rc%{stable_rc}.xz
Patch01: %{stable_patch_01}
%endif
@@ -654,9 +645,9 @@ Patch01: %{stable_patch_01}
# near the top of this spec file.
%else
%if 0%{?rcrev}
-Patch00: patch-3.%{upstream_sublevel}-rc%{rcrev}.bz2
+Patch00: patch-3.%{upstream_sublevel}-rc%{rcrev}.xz
%if 0%{?gitrev}
-Patch01: patch-3.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.bz2
+Patch01: patch-3.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.xz
%endif
%else
# pre-{base_sublevel+1}-rc1 case
@@ -691,8 +682,6 @@ Patch100: taint-vbox.patch
Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
Patch161: linux-2.6-i386-nx-emulation.patch
-Patch202: linux-2.6-debug-taint-vm.patch
-
Patch383: linux-2.6-defaults-aspm.patch
Patch390: linux-2.6-defaults-acpi-video.patch
@@ -717,10 +706,6 @@ Patch700: linux-2.6-e1000-ich9-montevina.patch
Patch800: linux-2.6-crash-driver.patch
-# Platform
-Patch900: samsung-laptop-brightness-fixes-3.2.patch
-Patch901: asus-laptop-3.2-backport.patch
-
# crypto/
# virt + ksm patches
@@ -729,17 +714,10 @@ Patch1500: fix_xen_guest_on_old_EC2.patch
# DRM
#atch1700: drm-edid-try-harder-to-fix-up-broken-headers.patch
-# nouveau + drm fixes
-Patch1810: drm-nouveau-updates.patch
-Patch1811: drm-nouveau-gf108.patch
# intel drm is all merged upstream
Patch1824: drm-intel-next.patch
# hush the i915 fbc noise
Patch1826: drm-i915-fbc-stfu.patch
-# rhbz#729882, https://bugs.freedesktop.org/attachment.cgi?id=49069
-Patch1827: drm-i915-sdvo-lvds-is-digital.patch
-
-Patch1850: drm-lower-severity-radeon-lockup.diff
Patch1900: linux-2.6-intel-iommu-igfx.patch
@@ -753,10 +731,6 @@ Patch2900: linux-2.6-v4l-dvb-update.patch
Patch2901: linux-2.6-v4l-dvb-experimental.patch
Patch2902: linux-2.6-v4l-dvb-uvcvideo-update.patch
-Patch2905: media-dib0700-correct-error-message.patch
-
-Patch3000: rcutree-avoid-false-quiescent-states.patch
-
# fs fixes
#rhbz 753346
@@ -765,53 +739,31 @@ Patch3500: jbd-jbd2-validate-sb-s_first-in-journal_get_superblo.patch
# NFSv4
# patches headed upstream
-Patch12010: add-appleir-usb-driver.patch
Patch12016: disable-i8042-check-on-apple-mac.patch
-Patch12021: udlfb-bind-framebuffer-to-interface.patch
-
-Patch12025: rcu-avoid-just-onlined-cpu-resched.patch
Patch12026: block-stray-block-put-after-teardown.patch
Patch12030: epoll-limit-paths.patch
-Patch12031: HID-wacom-Set-input-bits-before-registration.patch
Patch12303: dmar-disable-when-ricoh-multifunction.patch
Patch13002: revert-efi-rtclock.patch
Patch13003: efi-dont-map-boot-services-on-32bit.patch
-Patch13009: hvcs_pi_buf_alloc.patch
-
Patch20000: utrace.patch
# Flattened devicetree support
Patch21000: arm-omap-dt-compat.patch
Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
-#rhbz #735946
-Patch21020: 0001-mm-vmscan-Limit-direct-reclaim-for-higher-order-allo.patch
Patch21021: 0002-mm-Abort-reclaim-compaction-if-compaction-can-procee.patch
Patch21022: mm-do-not-stall-in-synchronous-compaction-for-THP-allocations.patch
-#rhbz 748691
-Patch21030: be2net-non-member-vlan-pkts-not-received-in-promisco.patch
-Patch21031: benet-remove-bogus-unlikely-on-vlan-check.patch
-
-Patch21040: x86-code-dump-fix-truncation.patch
-
-#rhbz 728607
-Patch21060: elantech.patch
-
#rhbz752176
Patch21080: sysfs-msi-irq-per-device.patch
-#backport brcm80211 from 3.2-rc1
-Patch21090: brcm80211.patch
-Patch21091: bcma-brcmsmac-compat.patch
# rhbz 754907
-Patch21100: cciss-fix-irqf-shared.patch
Patch21101: hpsa-add-irqf-shared.patch
#rhbz 731365
@@ -821,27 +773,15 @@ Patch21225: pci-Rework-ASPM-disable-code.patch
Patch21226: pci-crs-blacklist.patch
-#rhbz #757839
-Patch21230: net-sky2-88e8059-fix-link-speed.patch
-
#rhbz 717735
Patch21045: nfs-client-freezer.patch
#rhbz 590880
Patch21046: alps.patch
-#rhbz 741117
-Patch21048: b44-Use-dev_kfree_skb_irq-in-b44_tx.patch
-
#rhbz 746097
Patch21049: tpm_tis-delay-after-aborting-cmd.patch
-#rhbz 771006
-Patch21050: thp-reduce-khugepaged-freezing-latency.patch
-
-#rhbz 770233
-Patch21065: Bluetooth-Add-support-for-BCM20702A0.patch
-
Patch21070: ext4-Support-check-none-nocheck-mount-options.patch
Patch21071: ext4-Fix-error-handling-on-inode-bitmap-corruption.patch
@@ -865,10 +805,6 @@ Patch22100: msi-irq-sysfs-warning.patch
#rhbz 728740
Patch21076: rtl8192cu-Fix-WARNING-on-suspend-resume.patch
-Patch21077: 01-block-add-and-use-scsi_blk_cmd_ioctl.patch
-Patch21078: 02-block-fail-SCSI-passthrough-ioctls-on-partition-devs.patch
-Patch21079: 03-dm-dont-fwd-ioctls-from-LVs-to-underlying-dev.patch
-
#rhbz 782686
Patch21082: procfs-parse-mount-options.patch
Patch21083: procfs-add-hidepid-and-gid-mount-options.patch
@@ -877,9 +813,6 @@ Patch21084: proc-fix-null-pointer-deref-in-proc_pid_permission.patch
#rhbz 782681
Patch21085: proc-clean-up-and-fix-proc-pid-mem-handling.patch
-#rhbz 782687
-Patch21086: loop-prevent-information-leak-after-failed-read.patch
-
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1172,7 +1105,8 @@ ApplyPatch()
%endif
case "$patch" in
*.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
- *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
+ *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
+ *.xz) unxz < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
*) $patch_command ${1+"$@"} < "$RPM_SOURCE_DIR/$patch" ;;
esac
}
@@ -1428,9 +1362,6 @@ ApplyPatch linux-2.6-acpi-debug-infinite-loop.patch
ApplyPatch acpi-ensure-thermal-limits-match-cpu-freq.patch
ApplyPatch acpi-sony-nonvs-blacklist.patch
-# Various low-impact patches to aid debugging.
-ApplyPatch linux-2.6-debug-taint-vm.patch
-
#
# PCI
#
@@ -1484,16 +1415,9 @@ ApplyPatch fix_xen_guest_on_old_EC2.patch
# DRM core
#ApplyPatch drm-edid-try-harder-to-fix-up-broken-headers.patch
-# Nouveau DRM
-ApplyOptionalPatch drm-nouveau-updates.patch
-ApplyPatch drm-nouveau-gf108.patch
-
# Intel DRM
ApplyOptionalPatch drm-intel-next.patch
ApplyPatch drm-i915-fbc-stfu.patch
-ApplyPatch drm-i915-sdvo-lvds-is-digital.patch
-
-ApplyPatch drm-lower-severity-radeon-lockup.diff
ApplyPatch linux-2.6-intel-iommu-igfx.patch
@@ -1507,22 +1431,12 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-fixes.patch
ApplyOptionalPatch linux-2.6-v4l-dvb-update.patch
ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
-# Platform fixes not sent for -stable
-ApplyPatch samsung-laptop-brightness-fixes-3.2.patch
-ApplyPatch asus-laptop-3.2-backport.patch
-
# Patches headed upstream
-ApplyPatch rcutree-avoid-false-quiescent-states.patch
ApplyPatch disable-i8042-check-on-apple-mac.patch
-ApplyPatch add-appleir-usb-driver.patch
-
-ApplyPatch udlfb-bind-framebuffer-to-interface.patch
ApplyPatch epoll-limit-paths.patch
-ApplyPatch rcu-avoid-just-onlined-cpu-resched.patch
ApplyPatch block-stray-block-put-after-teardown.patch
-ApplyPatch HID-wacom-Set-input-bits-before-registration.patch
# rhbz#605888
ApplyPatch dmar-disable-when-ricoh-multifunction.patch
@@ -1530,40 +1444,13 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch
ApplyPatch revert-efi-rtclock.patch
ApplyPatch efi-dont-map-boot-services-on-32bit.patch
-ApplyPatch hvcs_pi_buf_alloc.patch
-
-ApplyPatch media-dib0700-correct-error-message.patch
-
# utrace.
ApplyPatch utrace.patch
-#rhbz #735946
-ApplyPatch 0001-mm-vmscan-Limit-direct-reclaim-for-higher-order-allo.patch
-ApplyPatch 0002-mm-Abort-reclaim-compaction-if-compaction-can-procee.patch
-ApplyPatch mm-do-not-stall-in-synchronous-compaction-for-THP-allocations.patch
-
-#rhbz 748691
-ApplyPatch be2net-non-member-vlan-pkts-not-received-in-promisco.patch
-ApplyPatch benet-remove-bogus-unlikely-on-vlan-check.patch
-
-#rhbz 736815
-ApplyPatch x86-code-dump-fix-truncation.patch
-
-#rhbz 728607
-ApplyPatch elantech.patch
-
#rhbz 752176
ApplyPatch sysfs-msi-irq-per-device.patch
-%if !%{with_backports}
-#backport brcm80211 from 3.2-rc1
-ApplyPatch brcm80211.patch
-# Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
-ApplyPatch bcma-brcmsmac-compat.patch
-%endif
-
# rhbz 754907
-ApplyPatch cciss-fix-irqf-shared.patch
ApplyPatch hpsa-add-irqf-shared.patch
#rhbz 731365
@@ -1573,27 +1460,15 @@ ApplyPatch pci-Rework-ASPM-disable-code.patch
#ApplyPatch pci-crs-blacklist.patch
-#rhbz #757839
-ApplyPatch net-sky2-88e8059-fix-link-speed.patch
-
#rhbz 717735
ApplyPatch nfs-client-freezer.patch
#rhbz 590880
ApplyPatch alps.patch
-#rhbz 741117
-ApplyPatch b44-Use-dev_kfree_skb_irq-in-b44_tx.patch
-
#rhbz 746097
ApplyPatch tpm_tis-delay-after-aborting-cmd.patch
-#rhbz 771006
-ApplyPatch thp-reduce-khugepaged-freezing-latency.patch
-
-#rhbz 770233
-ApplyPatch Bluetooth-Add-support-for-BCM20702A0.patch
-
#rhbz 771058
ApplyPatch msi-irq-sysfs-warning.patch
@@ -1608,11 +1483,6 @@ ApplyPatch KVM-x86-fix-missing-checks-in-syscall-emulation.patch
#rhbz 728740
ApplyPatch rtl8192cu-Fix-WARNING-on-suspend-resume.patch
-#rhbz 769911
-ApplyPatch 01-block-add-and-use-scsi_blk_cmd_ioctl.patch
-ApplyPatch 02-block-fail-SCSI-passthrough-ioctls-on-partition-devs.patch
-ApplyPatch 03-dm-dont-fwd-ioctls-from-LVs-to-underlying-dev.patch
-
#rhbz 782686
ApplyPatch procfs-parse-mount-options.patch
ApplyPatch procfs-add-hidepid-and-gid-mount-options.patch
@@ -1621,9 +1491,6 @@ ApplyPatch proc-fix-null-pointer-deref-in-proc_pid_permission.patch
#rhbz 782681
ApplyPatch proc-clean-up-and-fix-proc-pid-mem-handling.patch
-#rhbz 782687
-ApplyPatch loop-prevent-information-leak-after-failed-read.patch
-
# END OF PATCH APPLICATIONS
%endif
@@ -2399,6 +2266,9 @@ fi
# and build.
%changelog
+* Thu Jan 19 2012 Dave Jones <davej at redhat.com> 3.2.1-1
+- Rebase to Linux 3.2.1
+
* Thu Jan 19 2012 John W. Linville <linville at redhat.com>
- Pass the same make options to compat-wireless as to the base kernel
diff --git a/linux-2.6-32bit-mmap-exec-randomization.patch b/linux-2.6-32bit-mmap-exec-randomization.patch
index 6008173..c253233 100644
--- a/linux-2.6-32bit-mmap-exec-randomization.patch
+++ b/linux-2.6-32bit-mmap-exec-randomization.patch
@@ -152,7 +152,7 @@ Main executable randomisation (PIE) : 12 bits (guessed)
struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
--- a/arch/x86/mm/mmap.c
+++ b/arch/x86/mm/mmap.c
-@@ -124,13 +124,16 @@ static unsigned long mmap_legacy_base(void)
+@@ -124,13 +124,19 @@ static unsigned long mmap_legacy_base(void)
*/
void arch_pick_mmap_layout(struct mm_struct *mm)
{
@@ -163,9 +163,12 @@ Main executable randomisation (PIE) : 12 bits (guessed)
} else {
mm->mmap_base = mmap_base();
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
++#ifdef CONFIG_X86_32
+ if (!(current->personality & READ_IMPLIES_EXEC)
++ && !(__supported_pte_mask & _PAGE_NX)
+ && mmap_is_ia32())
+ mm->get_unmapped_exec_area = arch_get_unmapped_exec_area;
++#endif
mm->unmap_area = arch_unmap_area_topdown;
}
}
@@ -224,3 +227,25 @@ Main executable randomisation (PIE) : 12 bits (guessed)
if (new_addr & ~PAGE_MASK) {
ret = new_addr;
goto out;
+diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
+index 57d1868..29c0c35 100644
+--- a/arch/x86/kernel/process.c
++++ b/arch/x86/kernel/process.c
+@@ -669,6 +669,16 @@ unsigned long arch_align_stack(unsigned long sp)
+ unsigned long arch_randomize_brk(struct mm_struct *mm)
+ {
+ unsigned long range_end = mm->brk + 0x02000000;
+- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
++ unsigned long bump = 0;
++#ifdef CONFIG_X86_32
++ /* in the case of NX emulation, shove the brk segment way out of the
++ way of the exec randomization area, since it can collide with
++ future allocations if not. */
++ if ( (mm->get_unmapped_exec_area == arch_get_unmapped_exec_area) &&
++ (mm->brk < 0x08000000) ) {
++ bump = (TASK_SIZE/6);
++ }
++#endif
++ return bump + (randomize_range(mm->brk, range_end, 0) ? : mm->brk);
+ }
+
diff --git a/linux-2.6-e1000-ich9-montevina.patch b/linux-2.6-e1000-ich9-montevina.patch
index d45fd56..ec38a39 100644
--- a/linux-2.6-e1000-ich9-montevina.patch
+++ b/linux-2.6-e1000-ich9-montevina.patch
@@ -1,11 +1,22 @@
+From 802e6d8c8477a553a677b23a247d6d2638e01958 Mon Sep 17 00:00:00 2001
+From: Dave Jones <davej at redhat.com>
+Date: Wed, 26 Oct 2011 13:31:47 -0400
+Subject: [PATCH] e1000e: ich9 montevina
+
This only showed up in one SDV (Montevina).
The PCIE slots don't seem to like network cards, so this is the only hope
to get networking working. It's never going upstream, but it's low impact
enough to carry just to keep those SDVs working.
+---
+ drivers/net/ethernet/intel/e1000e/ich8lan.c | 6 ++++++
+ drivers/net/ethernet/intel/e1000e/netdev.c | 1 +
+ 2 files changed, 7 insertions(+), 0 deletions(-)
---- linux-2.6.35.noarch/drivers/net/e1000e/ich8lan.c~ 2010-09-29 17:53:13.000000000 -0400
-+++ linux-2.6.35.noarch/drivers/net/e1000e/ich8lan.c 2010-09-29 17:54:00.000000000 -0400
-@@ -424,6 +424,12 @@ static s32 e1000_init_phy_params_ich8lan
+diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
+index 6a17c62..0e40975 100644
+--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
++++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
+@@ -452,6 +452,12 @@ static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw)
/* Verify phy id */
switch (phy->id) {
@@ -18,9 +29,11 @@ enough to carry just to keep those SDVs working.
case IGP03E1000_E_PHY_ID:
phy->type = e1000_phy_igp_3;
phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT;
---- linux-2.6.35.noarch/drivers/net/e1000e/netdev.c~ 2010-09-29 17:54:07.000000000 -0400
-+++ linux-2.6.35.noarch/drivers/net/e1000e/netdev.c 2010-09-29 17:54:29.000000000 -0400
-@@ -5994,6 +5994,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci
+diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
+index a855db1..edac30b 100644
+--- a/drivers/net/ethernet/intel/e1000e/netdev.c
++++ b/drivers/net/ethernet/intel/e1000e/netdev.c
+@@ -6359,6 +6359,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan },
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan },
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan },
@@ -28,3 +41,6 @@ enough to carry just to keep those SDVs working.
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LM), board_ich9lan },
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_R_BM_LF), board_ich9lan },
+--
+1.7.6.4
+
diff --git a/linux-2.6-i386-nx-emulation.patch b/linux-2.6-i386-nx-emulation.patch
index fb58c61..07a0fae 100644
--- a/linux-2.6-i386-nx-emulation.patch
+++ b/linux-2.6-i386-nx-emulation.patch
@@ -592,25 +592,3 @@
mmu_notifier_invalidate_range_start(mm, start, end);
if (is_vm_hugetlb_page(vma))
hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
-diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
-index 57d1868..29c0c35 100644
---- a/arch/x86/kernel/process.c
-+++ b/arch/x86/kernel/process.c
-@@ -669,6 +669,16 @@ unsigned long arch_align_stack(unsigned long sp)
- unsigned long arch_randomize_brk(struct mm_struct *mm)
- {
- unsigned long range_end = mm->brk + 0x02000000;
-- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
-+ unsigned long bump = 0;
-+#ifdef CONFIG_X86_32
-+ /* in the case of NX emulation, shove the brk segment way out of the
-+ way of the exec randomization area, since it can collide with
-+ future allocations if not. */
-+ if ( (mm->get_unmapped_exec_area == arch_get_unmapped_exec_area) &&
-+ (mm->brk < 0x08000000) ) {
-+ bump = (TASK_SIZE/6);
-+ }
-+#endif
-+ return bump + (randomize_range(mm->brk, range_end, 0) ? : mm->brk);
- }
-
diff --git a/linux-2.6-intel-iommu-igfx.patch b/linux-2.6-intel-iommu-igfx.patch
index b2f8f19..3a45aba 100644
--- a/linux-2.6-intel-iommu-igfx.patch
+++ b/linux-2.6-intel-iommu-igfx.patch
@@ -1,6 +1,7 @@
-Subject: [PATCH] [intel_iommu] Default to igfx_off
+From 602e1f209dd983e40d989e871cd253e8187899b8 Mon Sep 17 00:00:00 2001
From: drago01 <drago01 at gmail.com>
-To: fedora-kernel-list <fedora-kernel-list at redhat.com>
+Date: Wed, 26 Oct 2011 13:37:27 -0400
+Subject: [PATCH] Default to igfx_off
This option seems to causes way to many issues, it is
being investigated by Intel's chipset team for months now and
@@ -16,14 +17,14 @@ Signed-off-by: Adel Gadllah <adel.gadllah at gmail.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
---
Documentation/kernel-parameters.txt | 11 +++++------
- drivers/pci/intel-iommu.c | 9 +++++----
+ drivers/iommu/intel-iommu.c | 9 +++++----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index e7848a0..9914485 100644
+index 81c287f..ee5693b 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -992,12 +992,11 @@ and is between 256 and 4096 characters. It is defined in the file
+@@ -1014,12 +1014,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
Enable intel iommu driver.
off
Disable intel iommu driver.
@@ -40,22 +41,22 @@ index e7848a0..9914485 100644
+ mapped as normal device.
forcedac [x86_64]
With this option iommu will not optimize to look
- for io virtual address below 32 bit forcing dual
-diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
-index 4173125..8f36786 100644
+ for io virtual address below 32-bit forcing dual
+diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
+index bdc447f..240db6b 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
-@@ -340,7 +340,8 @@ int dmar_disabled = 0;
- int dmar_disabled = 1;
- #endif /*CONFIG_DMAR_DEFAULT_ON*/
-
+@@ -408,7 +408,8 @@ int dmar_disabled = 1;
+ int intel_iommu_enabled = 0;
+ EXPORT_SYMBOL_GPL(intel_iommu_enabled);
+
-static int dmar_map_gfx = 1;
+/* disabled by default; causes way too many issues */
+static int dmar_map_gfx = 0;
static int dmar_forcedac;
static int intel_iommu_strict;
-
-@@ -361,10 +362,10 @@ static int __init intel_iommu_setup(char *str)
+ static int intel_iommu_superpage = 1;
+@@ -433,10 +434,10 @@ static int __init intel_iommu_setup(char *str)
} else if (!strncmp(str, "off", 3)) {
dmar_disabled = 1;
printk(KERN_INFO "Intel-IOMMU: disabled\n");
@@ -70,9 +71,5 @@ index 4173125..8f36786 100644
printk(KERN_INFO
"Intel-IOMMU: Forcing DAC for PCI devices\n");
--
-1.6.6.1
-_______________________________________________
-kernel mailing list
-kernel at lists.fedoraproject.org
-https://admin.fedoraproject.org/mailman/listinfo/kernel
+1.7.7.4
diff --git a/nfs-client-freezer.patch b/nfs-client-freezer.patch
index 6b4d34d..5f5b083 100644
--- a/nfs-client-freezer.patch
+++ b/nfs-client-freezer.patch
@@ -1,106 +1,4 @@
@@ -, +, @@
- fs/cifs/transport.c | 3 ++-
- include/linux/freezer.h | 19 +++++++++++++++++--
- 2 files changed, 19 insertions(+), 3 deletions(-)
---- a/fs/cifs/transport.c
-+++ a/fs/cifs/transport.c
-@@ -26,6 +26,7 @@
- #include <linux/wait.h>
- #include <linux/net.h>
- #include <linux/delay.h>
-+#include <linux/freezer.h>
- #include <asm/uaccess.h>
- #include <asm/processor.h>
- #include <linux/mempool.h>
-@@ -324,7 +325,7 @@ wait_for_response(struct TCP_Server_Info *server, struct mid_q_entry *midQ)
- {
- int error;
-
-- error = wait_event_killable(server->response_q,
-+ error = wait_event_freezekillable(server->response_q,
- midQ->midState != MID_REQUEST_SUBMITTED);
- if (error < 0)
- return -ERESTARTSYS;
---- a/include/linux/freezer.h
-+++ a/include/linux/freezer.h
-@@ -134,10 +134,25 @@ static inline void set_freezable_with_signal(void)
- }
-
- /*
-- * Freezer-friendly wrappers around wait_event_interruptible() and
-- * wait_event_interruptible_timeout(), originally defined in <linux/wait.h>
-+ * Freezer-friendly wrappers around wait_event_interruptible(),
-+ * wait_event_killable() and wait_event_interruptible_timeout(), originally
-+ * defined in <linux/wait.h>
- */
-
-+#define wait_event_freezekillable(wq, condition) \
-+({ \
-+ int __retval; \
-+ do { \
-+ __retval = wait_event_killable(wq, \
-+ (condition) || freezing(current)); \
-+ if (__retval && !freezing(current)) \
-+ break; \
-+ else if (!(condition)) \
-+ __retval = -ERESTARTSYS; \
-+ } while (try_to_freeze()); \
-+ __retval; \
-+})
-+
- #define wait_event_freezable(wq, condition) \
- ({ \
- int __retval; \
- include/linux/freezer.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
---- a/include/linux/freezer.h
-+++ a/include/linux/freezer.h
-@@ -143,7 +143,7 @@ static inline void set_freezable_with_signal(void)
- ({ \
- int __retval; \
- do { \
-- __retval = wait_event_killable(wq, \
-+ __retval = wait_event_killable(wq, \
- (condition) || freezing(current)); \
- if (__retval && !freezing(current)) \
- break; \
- include/linux/freezer.h | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
---- a/include/linux/freezer.h
-+++ a/include/linux/freezer.h
-@@ -203,6 +203,9 @@ static inline void set_freezable_with_signal(void) {}
- #define wait_event_freezable_timeout(wq, condition, timeout) \
- wait_event_interruptible_timeout(wq, condition, timeout)
-
-+#define wait_event_freezekillable(wq, condition) \
-+ wait_event_killable(wq, condition)
-+
- #endif /* !CONFIG_FREEZER */
-
- #endif /* FREEZER_H_INCLUDED */
- description on Rafael's request.]
- include/linux/freezer.h | 11 +++--------
- 1 files changed, 3 insertions(+), 8 deletions(-)
---- a/include/linux/freezer.h
-+++ a/include/linux/freezer.h
-@@ -142,14 +142,9 @@ static inline void set_freezable_with_signal(void)
- #define wait_event_freezekillable(wq, condition) \
- ({ \
- int __retval; \
-- do { \
-- __retval = wait_event_killable(wq, \
-- (condition) || freezing(current)); \
-- if (__retval && !freezing(current)) \
-- break; \
-- else if (!(condition)) \
-- __retval = -ERESTARTSYS; \
-- } while (try_to_freeze()); \
-+ freezer_do_not_count(); \
-+ __retval = wait_event_killable(wq, (condition)); \
-+ freezer_count(); \
- __retval; \
- })
-
fs/nfs/inode.c | 3 ++-
fs/nfs/nfs3proc.c | 3 ++-
fs/nfs/nfs4proc.c | 5 +++--
@@ -156,7 +54,7 @@
#include "nfs4_fs.h"
#include "delegation.h"
-@@ -244,7 +245,7 @@ static int nfs4_delay(struct rpc_clnt *clnt, long *timeout)
+@@ -241,7 +242,7 @@ static int nfs4_delay(struct rpc_clnt *clnt, long *timeout)
*timeout = NFS4_POLL_RETRY_MIN;
if (*timeout > NFS4_POLL_RETRY_MAX)
*timeout = NFS4_POLL_RETRY_MAX;
@@ -165,7 +63,7 @@
if (fatal_signal_pending(current))
res = -ERESTARTSYS;
*timeout <<= 1;
-@@ -3970,7 +3971,7 @@ int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4
+@@ -3950,7 +3951,7 @@ int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4
static unsigned long
nfs4_set_lock_task_retry(unsigned long timeout)
{
@@ -195,7 +93,7 @@
return res;
--- a/include/linux/freezer.h
+++ a/include/linux/freezer.h
-@@ -134,6 +134,29 @@ static inline void set_freezable_with_signal(void)
+@@ -135,6 +135,29 @@ static inline void set_freezable_with_signal(void)
}
/*
@@ -225,7 +123,7 @@
* Freezer-friendly wrappers around wait_event_interruptible(),
* wait_event_killable() and wait_event_interruptible_timeout(), originally
* defined in <linux/wait.h>
-@@ -192,6 +215,11 @@ static inline int freezer_should_skip(struct task_struct *p) { return 0; }
+@@ -194,6 +217,11 @@ static inline int freezer_should_skip(struct task_struct *p) { return 0; }
static inline void set_freezable(void) {}
static inline void set_freezable_with_signal(void) {}
@@ -260,7 +158,7 @@
1 files changed, 18 insertions(+), 3 deletions(-)
--- a/include/linux/freezer.h
+++ a/include/linux/freezer.h
-@@ -140,18 +140,33 @@ static inline void set_freezable_with_signal(void)
+@@ -141,18 +141,33 @@ static inline void set_freezable_with_signal(void)
* while in this function.
*/
diff --git a/rtl8192cu-Fix-WARNING-on-suspend-resume.patch b/rtl8192cu-Fix-WARNING-on-suspend-resume.patch
index e784b16..bdc8a54 100644
--- a/rtl8192cu-Fix-WARNING-on-suspend-resume.patch
+++ b/rtl8192cu-Fix-WARNING-on-suspend-resume.patch
@@ -1,8 +1,3 @@
-From e234ca17f2d5ce23606fceef2df6c02f8555547e Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer at redhat.com>
-Date: Wed, 11 Jan 2012 13:35:33 -0500
-Subject: [PATCH] rtl8192cu: Fix WARNING on suspend/resume
-
A recent LKML thread (http://lkml.indiana.edu/hypermail/linux/kernel/1112.3/00965.html)
discusses warnings that occur during a suspend/resume cycle. The driver
attempts to read the firmware file before userspace is ready, leading to the
@@ -20,6 +15,8 @@ https://bugzilla.redhat.com/show_bug.cgi?id=771002.
Note: This patch also touches rtl8192ce as the "firmware" loaded message
is now printed in the wrong place.
+Note: This patch also touches rtl8192ce as the "firmware" loaded message
+is now printed in the wrong place.
Reported-by: Mohammed Arafa <bugzilla at xxxxxxxxxxxx>
Reported-by: Dave Jones <davej at xxxxxxxxxx>
@@ -27,30 +24,25 @@ Signed-off-by: Larry Finger <Larry.Finger at xxxxxxxxxxxx>
Cc: Linus Torvalds <torvalds at xxxxxxxxxxxxxxxxxxxx>
Cc: Stable <stable at xxxxxxxxxxxxxxx>
-Backported to Fedora 3.1.x.
---
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 1 -
drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 1 +
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 58 +++++++++++++++++----
3 files changed, 49 insertions(+), 11 deletions(-)
-diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
-index 49a064b..e3c4ac7 100644
---- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
-+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
-@@ -226,7 +226,6 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
+--- linux-2.6/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c 2012-01-13 13:07:58.830625006 -0500
++++ linux-2.6/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c 2012-01-13 13:08:06.825439927 -0500
+@@ -227,7 +227,6 @@ int rtl92c_download_fw(struct ieee80211_
u32 fwsize;
enum version_8192c version = rtlhal->version;
- pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
if (!rtlhal->pfirmware)
return 1;
-
-diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
-index 373dc78..9c3a8f1 100644
---- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
-+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
-@@ -171,6 +171,7 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw)
+
+--- linux-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
++++ linux-2.6/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+@@ -186,6 +186,7 @@ int rtl92c_init_sw_vars(struct ieee80211
memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
rtlpriv->rtlhal.fwsize = firmware->size;
release_firmware(firmware);
@@ -58,21 +50,18 @@ index 373dc78..9c3a8f1 100644
return 0;
}
-diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
-index ef63c0d..f4230dd 100644
---- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
-+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
-@@ -42,6 +42,9 @@
- #include "led.h"
+--- linux-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
++++ linux-2.6/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+@@ -43,6 +43,8 @@
#include "hw.h"
#include <linux/vmalloc.h>
+ #include <linux/module.h>
+#include <linux/atomic.h>
+#include <linux/types.h>
-+
MODULE_AUTHOR("Georgia <georgia at realtek.com>");
MODULE_AUTHOR("Ziv Huang <ziv_huang at realtek.com>");
-@@ -50,6 +53,10 @@ MODULE_LICENSE("GPL");
+@@ -51,6 +53,10 @@ MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Realtek 8192C/8188C 802.11n USB wireless");
MODULE_FIRMWARE("rtlwifi/rtl8192cufw.bin");
@@ -83,10 +72,10 @@ index ef63c0d..f4230dd 100644
static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
-@@ -60,12 +67,21 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
- rtlpriv->dm.dm_flag = 0;
- rtlpriv->dm.disable_framebursting = 0;
+@@ -62,12 +68,21 @@ static int rtl92cu_init_sw_vars(struct i
+ rtlpriv->dm.disable_framebursting = false;
rtlpriv->dm.thermalvalue = 0;
+ rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
- rtlpriv->rtlhal.pfirmware = vmalloc(0x4000);
- if (!rtlpriv->rtlhal.pfirmware) {
+
@@ -107,7 +96,7 @@ index ef63c0d..f4230dd 100644
/* request fw */
err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
rtlpriv->io.dev);
-@@ -80,9 +96,14 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
+@@ -82,9 +97,14 @@ static int rtl92cu_init_sw_vars(struct i
release_firmware(firmware);
return 1;
}
@@ -123,7 +112,7 @@ index ef63c0d..f4230dd 100644
return 0;
}
-@@ -91,12 +112,30 @@ static void rtl92cu_deinit_sw_vars(struct ieee80211_hw *hw)
+@@ -93,12 +113,30 @@ static void rtl92cu_deinit_sw_vars(struc
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -156,7 +145,7 @@ index ef63c0d..f4230dd 100644
static struct rtl_hal_ops rtl8192cu_hal_ops = {
.init_sw_vars = rtl92cu_init_sw_vars,
.deinit_sw_vars = rtl92cu_deinit_sw_vars,
-@@ -338,11 +377,10 @@ static struct usb_driver rtl8192cu_driver = {
+@@ -374,11 +412,10 @@ static struct usb_driver rtl8192cu_drive
.disconnect = rtl_usb_disconnect,
.id_table = rtl8192c_usb_ids,
@@ -172,6 +161,3 @@ index ef63c0d..f4230dd 100644
#ifdef CONFIG_AUTOSUSPEND
.supports_autosuspend = 1,
#endif
---
-1.7.7.5
-
diff --git a/sources b/sources
index 5883153..7401701 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-8d43453f8159b2332ad410b19d86a931 linux-3.1.tar.bz2
+364066fa18767ec0ae5f4e4abcf9dc51 linux-3.2.tar.xz
204381bc537b689edcb15df0efed6467 compat-wireless-3.2-1.tar.bz2
-a8e1c25a93a685ec2a1c3a808715fe9d patch-3.1.10.bz2
+62ac6ac9b870162f693ecf5e8606423a patch-3.2.1.xz
diff --git a/utrace.patch b/utrace.patch
index 576c737..060d351 100644
--- a/utrace.patch
+++ b/utrace.patch
@@ -1,39 +1,38 @@
From davej Wed Aug 3 15:16:11 2011
+From oleg at redhat.com Mon Nov 21 15:06:14 2011
Return-Path: oleg at redhat.com
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:11 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
- zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:15:37 -0400 (EDT)
+Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
+ zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:14 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 92D6F9D8C5;
- Wed, 3 Aug 2011 15:12:08 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id RRq2PiCBdMzK; Wed, 3 Aug 2011 15:12:08 -0400 (EDT)
-Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 75C149D898;
- Wed, 3 Aug 2011 15:12:08 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 9A1F8D50F1;
+ Mon, 21 Nov 2011 15:06:14 -0500 (EST)
+Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id gJzpul4rDNnA; Mon, 21 Nov 2011 15:06:14 -0500 (EST)
+Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 7DD4BD50EA;
+ Mon, 21 Nov 2011 15:06:14 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JC01d029136;
- Wed, 3 Aug 2011 15:12:01 -0400
+ by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK6BJJ022074;
+ Mon, 21 Nov 2011 15:06:12 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:09:28 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:09:26 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:01:32 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:01:30 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 01/31] utrace core
-Message-ID: <20110803190926.GA30903 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 01/33] utrace core
+Message-ID: <20111121200130.GA27756 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
Status: RO
Content-Length: 139951
Lines: 3867
@@ -711,10 +710,10 @@ index 3a1dafd..f0c0ea2 100644
if (p->files)
fdt = files_fdtable(p->files);
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 20b03bf..c6d79af 100644
+index 68daf4f..4d45f93 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
-@@ -1406,6 +1406,11 @@ struct task_struct {
+@@ -1403,6 +1403,11 @@ struct task_struct {
#endif
seccomp_t seccomp;
@@ -1425,7 +1424,7 @@ index 0000000..f251efe
+
+#endif /* linux/utrace.h */
diff --git a/init/Kconfig b/init/Kconfig
-index d627783..7afce1f 100644
+index 43298f9..3f670e5 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -372,6 +372,15 @@ config AUDIT_TREE
@@ -1445,7 +1444,7 @@ index d627783..7afce1f 100644
menu "RCU Subsystem"
diff --git a/kernel/Makefile b/kernel/Makefile
-index d06467f..85828da 100644
+index e898c5b..e43bbfb 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -68,6 +68,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
@@ -3906,47 +3905,40 @@ index 0000000..ef856c9
1.5.5.1
-From davej Wed Aug 3 15:16:13 2011
+From oleg at redhat.com Mon Nov 21 15:06:17 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:13 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:15:37 -0400 (EDT)
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:17 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 419B39D8CF;
- Wed, 3 Aug 2011 15:12:11 -0400 (EDT)
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 1CCED128D6B;
+ Mon, 21 Nov 2011 15:06:17 -0500 (EST)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id AmaThyCcp1K4; Wed, 3 Aug 2011 15:12:11 -0400 (EDT)
-Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 2A0B29CE59;
- Wed, 3 Aug 2011 15:12:11 -0400 (EDT)
+ with ESMTP id FWdJDV74o-ay; Mon, 21 Nov 2011 15:06:17 -0500 (EST)
+Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 082081285E4;
+ Mon, 21 Nov 2011 15:06:17 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JC3DW023262;
- Wed, 3 Aug 2011 15:12:04 -0400
+ by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK6E7d015251;
+ Mon, 21 Nov 2011 15:06:15 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:09:31 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:09:29 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:01:35 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:01:33 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 02/31] utrace: add utrace_init_task/utrace_free_task calls
-Message-ID: <20110803190929.GA30907 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 02/33] utrace: add utrace_init_task/utrace_free_task calls
+Message-ID: <20111121200133.GA27759 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
Status: RO
Content-Length: 1295
Lines: 47
@@ -3966,7 +3958,7 @@ Signed-off-by: Oleg Nesterov <oleg at redhat.com>
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/kernel/fork.c b/kernel/fork.c
-index e7ceaca..a9891da 100644
+index ba0d172..b8719c2 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -66,6 +66,7 @@
@@ -3986,7 +3978,7 @@ index e7ceaca..a9891da 100644
free_task_struct(tsk);
}
EXPORT_SYMBOL(free_task);
-@@ -1096,6 +1099,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+@@ -1093,6 +1096,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
if (!p)
goto fork_out;
@@ -3999,47 +3991,40 @@ index e7ceaca..a9891da 100644
1.5.5.1
-From davej Wed Aug 3 15:16:18 2011
+From oleg at redhat.com Mon Nov 21 15:06:20 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:18 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
- zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:07 -0400 (EDT)
+Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
+ zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:20 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id F28379DE70;
- Wed, 3 Aug 2011 15:12:13 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id p92IDp0LZ5jX; Wed, 3 Aug 2011 15:12:13 -0400 (EDT)
-Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D4E339DE68;
- Wed, 3 Aug 2011 15:12:13 -0400 (EDT)
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 8779AD87BC;
+ Mon, 21 Nov 2011 15:06:20 -0500 (EST)
+Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id umzAMwRd7rMt; Mon, 21 Nov 2011 15:06:20 -0500 (EST)
+Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 72C98D8707;
+ Mon, 21 Nov 2011 15:06:20 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JC6IA023283;
- Wed, 3 Aug 2011 15:12:07 -0400
+ by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK6HAj015261;
+ Mon, 21 Nov 2011 15:06:18 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:09:34 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:09:32 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:01:39 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:01:36 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 03/31] tracehooks: add utrace hooks
-Message-ID: <20110803190932.GA30915 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 03/33] tracehooks: add utrace hooks
+Message-ID: <20111121200136.GA27766 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
Status: RO
Content-Length: 2310
Lines: 75
@@ -4120,48 +4105,41 @@ index a71a292..8cc28bc 100644
1.5.5.1
-From davej Wed Aug 3 15:16:14 2011
+From oleg at redhat.com Mon Nov 21 15:06:23 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:14 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
- zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:15:37 -0400 (EDT)
+Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
+ zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:23 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 92FCA9D8FA;
- Wed, 3 Aug 2011 15:12:16 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id lQaZCHUpw8DT; Wed, 3 Aug 2011 15:12:16 -0400 (EDT)
-Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 7479B9D8C9;
- Wed, 3 Aug 2011 15:12:16 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 6559BD4FDE;
+ Mon, 21 Nov 2011 15:06:23 -0500 (EST)
+Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id 6BjISiO+cS1U; Mon, 21 Nov 2011 15:06:23 -0500 (EST)
+Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 50366D4C39;
+ Mon, 21 Nov 2011 15:06:23 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JC91G023308;
- Wed, 3 Aug 2011 15:12:09 -0400
+ by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK6KT9017533;
+ Mon, 21 Nov 2011 15:06:21 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:09:37 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:09:35 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:01:42 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:01:39 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 04/31] tracehooks: reintroduce
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 04/33] tracehooks: reintroduce
tracehook_consider_fatal_signal()
-Message-ID: <20110803190935.GA30918 at redhat.com>
+Message-ID: <20111121200139.GA27769 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22
Status: RO
Content-Length: 3257
Lines: 90
@@ -4177,7 +4155,7 @@ Signed-off-by: Oleg Nesterov <oleg at redhat.com>
3 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
-index ffabcd9..1018ab6 100644
+index a9807dd..f506e1b 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -329,7 +329,7 @@ void __kprobes do_per_trap(struct pt_regs *regs)
@@ -4189,7 +4167,7 @@ index ffabcd9..1018ab6 100644
return;
info.si_signo = SIGTRAP;
info.si_errno = 0;
-@@ -428,7 +428,7 @@ static void __kprobes illegal_op(struct pt_regs *regs, long pgm_int_code,
+@@ -429,7 +429,7 @@ static void __kprobes illegal_op(struct pt_regs *regs, long pgm_int_code,
if (get_user(*((__u16 *) opcode), (__u16 __user *) location))
return;
if (*((__u16 *) opcode) == S390_BREAKPOINT_U16) {
@@ -4232,7 +4210,7 @@ index 8cc28bc..ec2af67 100644
/**
* set_notify_resume - cause tracehook_notify_resume() to be called
diff --git a/kernel/signal.c b/kernel/signal.c
-index 291c970..d7ef0da 100644
+index b3f78d0..d7b90cd 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -494,7 +494,7 @@ int unhandled_signal(struct task_struct *tsk, int sig)
@@ -4257,46 +4235,39 @@ index 291c970..d7ef0da 100644
1.5.5.1
-From davej Wed Aug 3 15:16:20 2011
+From oleg at redhat.com Mon Nov 21 15:06:26 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:20 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:08 -0400 (EDT)
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:25 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 374FE9DE74;
- Wed, 3 Aug 2011 15:12:19 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id E7A2DD498A;
+ Mon, 21 Nov 2011 15:06:25 -0500 (EST)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id Sun0Twp72xGV; Wed, 3 Aug 2011 15:12:19 -0400 (EDT)
+ with ESMTP id 4L9zskFVsr4I; Mon, 21 Nov 2011 15:06:25 -0500 (EST)
Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 223E39DD25;
- Wed, 3 Aug 2011 15:12:19 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D3487D4C39;
+ Mon, 21 Nov 2011 15:06:25 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCBgK008326;
- Wed, 3 Aug 2011 15:12:12 -0400
+ by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK6Nnp017552;
+ Mon, 21 Nov 2011 15:06:24 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:09:39 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:09:37 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:01:44 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:01:42 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 05/31] add utrace hooks into sig_ignored() and
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 05/33] add utrace hooks into sig_ignored() and
recalc_sigpending()
-Message-ID: <20110803190937.GA30926 at redhat.com>
+Message-ID: <20111121200142.GA27777 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22
Status: RO
@@ -4327,7 +4298,7 @@ index f251efe..1b8da1c 100644
/*
diff --git a/kernel/signal.c b/kernel/signal.c
-index d7ef0da..0f9af0b 100644
+index d7b90cd..8594cb2 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -87,7 +87,7 @@ static int sig_ignored(struct task_struct *t, int sig, int from_ancestor_ns)
@@ -4355,45 +4326,38 @@ index d7ef0da..0f9af0b 100644
1.5.5.1
-From davej Wed Aug 3 15:16:21 2011
+From oleg at redhat.com Mon Nov 21 15:06:28 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:21 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:09 -0400 (EDT)
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:28 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 054279DE7D;
- Wed, 3 Aug 2011 15:12:22 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 6E4A6D4F4A;
+ Mon, 21 Nov 2011 15:06:28 -0500 (EST)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id 1BosZIzYSIW0; Wed, 3 Aug 2011 15:12:21 -0400 (EDT)
+ with ESMTP id vEeGLyK1+rX9; Mon, 21 Nov 2011 15:06:28 -0500 (EST)
Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id E41DC9DE7B;
- Wed, 3 Aug 2011 15:12:21 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 5AD50D4C39;
+ Mon, 21 Nov 2011 15:06:28 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p73JCEgD022264;
- Wed, 3 Aug 2011 15:12:15 -0400
+ by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id pALK6QOB029543;
+ Mon, 21 Nov 2011 15:06:26 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:09:42 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:09:40 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:01:47 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:01:45 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 06/31] restore the EXEC/EXIT/CLONE utrace hooks
-Message-ID: <20110803190940.GA30929 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 06/33] restore the EXEC/EXIT/CLONE utrace hooks
+Message-ID: <20111121200145.GA27780 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
Status: RO
@@ -4412,10 +4376,10 @@ Signed-off-by: Oleg Nesterov <oleg at redhat.com>
4 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/fs/exec.c b/fs/exec.c
-index da80612..a0814cd 100644
+index 3625464..7d8f8bd 100644
--- a/fs/exec.c
+++ b/fs/exec.c
-@@ -1401,9 +1401,12 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
+@@ -1397,9 +1397,12 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
*/
bprm->recursion_depth = depth;
if (retval >= 0) {
@@ -4447,10 +4411,10 @@ index 1b8da1c..9ac0b1b 100644
/*
diff --git a/kernel/exit.c b/kernel/exit.c
-index 2913b35..c1b0ab6 100644
+index d0b7d98..f5eba3b 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
-@@ -913,6 +913,7 @@ NORET_TYPE void do_exit(long code)
+@@ -911,6 +911,7 @@ NORET_TYPE void do_exit(long code)
*/
set_fs(USER_DS);
@@ -4459,10 +4423,10 @@ index 2913b35..c1b0ab6 100644
validate_creds_for_do_exit(tsk);
diff --git a/kernel/fork.c b/kernel/fork.c
-index a9891da..37f4a07 100644
+index b8719c2..09d5049 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
-@@ -1539,6 +1539,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1535,6 +1535,8 @@ long do_fork(unsigned long clone_flags,
audit_finish_fork(p);
@@ -4471,7 +4435,7 @@ index a9891da..37f4a07 100644
/*
* We set PF_STARTING at creation in case tracing wants to
* use this to distinguish a fully live task from one that
-@@ -1550,6 +1552,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1546,6 +1548,8 @@ long do_fork(unsigned long clone_flags,
wake_up_new_task(p);
/* forking complete and child started to run, tell ptracer */
@@ -4484,48 +4448,41 @@ index a9891da..37f4a07 100644
1.5.5.1
-From davej Wed Aug 3 15:16:23 2011
+From oleg at redhat.com Mon Nov 21 15:06:30 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:23 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
- zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:13 -0400 (EDT)
+Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
+ zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:30 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id B36EC9DE82;
- Wed, 3 Aug 2011 15:12:24 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id 7Qqv+lXfqHw6; Wed, 3 Aug 2011 15:12:24 -0400 (EDT)
-Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 9F8AF9DD25;
- Wed, 3 Aug 2011 15:12:24 -0400 (EDT)
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D248D1284E0;
+ Mon, 21 Nov 2011 15:06:30 -0500 (EST)
+Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id divvekTmLScS; Mon, 21 Nov 2011 15:06:30 -0500 (EST)
+Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id BDC9412800E;
+ Mon, 21 Nov 2011 15:06:30 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCH0U023349;
- Wed, 3 Aug 2011 15:12:17 -0400
+ by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id pALK6Shj029546;
+ Mon, 21 Nov 2011 15:06:29 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:09:45 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:09:43 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:01:49 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:01:47 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 07/31] utrace: utrace_report_death() can use
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 07/33] utrace: utrace_report_death() can use
task_utrace_struct()
-Message-ID: <20110803190943.GA30936 at redhat.com>
+Message-ID: <20111121200147.GA27787 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
Status: RO
Content-Length: 1692
Lines: 44
@@ -4575,45 +4532,38 @@ index ef856c9..1e750ad 100644
1.5.5.1
-From davej Wed Aug 3 15:16:15 2011
+From oleg at redhat.com Mon Nov 21 15:06:33 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:15 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
- zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:15:39 -0400 (EDT)
+Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
+ zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:33 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 76DA49D9C7;
- Wed, 3 Aug 2011 15:12:27 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id 25xHJjCTouA4; Wed, 3 Aug 2011 15:12:27 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 62E1BD50A3;
+ Mon, 21 Nov 2011 15:06:33 -0500 (EST)
+Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id FB36YkOAHDc5; Mon, 21 Nov 2011 15:06:33 -0500 (EST)
Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 490E79D9AB;
- Wed, 3 Aug 2011 15:12:27 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 4D161D4C39;
+ Mon, 21 Nov 2011 15:06:33 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCKXo023360;
- Wed, 3 Aug 2011 15:12:20 -0400
+ by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK6VBW022130;
+ Mon, 21 Nov 2011 15:06:31 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:09:47 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:09:45 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:01:52 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:01:50 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 08/31] restore the DEATH/REAP utrace hooks
-Message-ID: <20110803190945.GA30939 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 08/33] restore the DEATH/REAP utrace hooks
+Message-ID: <20111121200150.GA27790 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
Status: RO
@@ -4666,7 +4616,7 @@ index 9a2e2f4..cf13839 100644
+
#endif /* linux/utrace.h */
diff --git a/kernel/exit.c b/kernel/exit.c
-index c1b0ab6..ba5ba22 100644
+index f5eba3b..746c5df 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -168,6 +168,8 @@ void release_task(struct task_struct * p)
@@ -4678,7 +4628,7 @@ index c1b0ab6..ba5ba22 100644
/* don't need to get the RCU readlock here - the process is dead and
* can't be modifying its own credentials. But shut RCU-lockdep up */
rcu_read_lock();
-@@ -860,6 +862,8 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
+@@ -858,6 +860,8 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
wake_up_process(tsk->signal->group_exit_task);
write_unlock_irq(&tasklist_lock);
@@ -4691,47 +4641,40 @@ index c1b0ab6..ba5ba22 100644
1.5.5.1
-From davej Wed Aug 3 15:22:02 2011
+From oleg at redhat.com Mon Nov 21 15:06:35 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:22:02 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
- zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:17:16 -0400 (EDT)
+Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
+ zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:35 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 26DB69DE8C;
- Wed, 3 Aug 2011 15:12:30 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id DbxGfmFvtTiR; Wed, 3 Aug 2011 15:12:30 -0400 (EDT)
-Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 0A30A9DE91;
- Wed, 3 Aug 2011 15:12:30 -0400 (EDT)
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D4AB3D8761;
+ Mon, 21 Nov 2011 15:06:35 -0500 (EST)
+Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id TiShkH1f6rnj; Mon, 21 Nov 2011 15:06:35 -0500 (EST)
+Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id BCB85D877F;
+ Mon, 21 Nov 2011 15:06:35 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCMDQ008389;
- Wed, 3 Aug 2011 15:12:23 -0400
+ by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK6XNu015312;
+ Mon, 21 Nov 2011 15:06:34 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:09:50 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:09:48 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:01:54 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:01:52 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 09/31] utrace: remove jobctl bits
-Message-ID: <20110803190948.GA30942 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 09/33] utrace: remove jobctl bits
+Message-ID: <20111121200152.GA27793 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
Status: RO
Content-Length: 1888
Lines: 56
@@ -4793,47 +4736,40 @@ index 1e750ad..5d3974e 100644
1.5.5.1
-From davej Wed Aug 3 15:16:17 2011
+From oleg at redhat.com Mon Nov 21 15:06:38 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:17 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
- zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:15:52 -0400 (EDT)
+Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
+ zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:38 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id AB6E39DA46;
- Wed, 3 Aug 2011 15:12:32 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id LkzmRGslEelr; Wed, 3 Aug 2011 15:12:32 -0400 (EDT)
-Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 959659DA60;
- Wed, 3 Aug 2011 15:12:32 -0400 (EDT)
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 425CED8707;
+ Mon, 21 Nov 2011 15:06:38 -0500 (EST)
+Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id 9paRC+dwSflh; Mon, 21 Nov 2011 15:06:38 -0500 (EST)
+Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 2DDBCD8410;
+ Mon, 21 Nov 2011 15:06:38 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCPx7023400;
- Wed, 3 Aug 2011 15:12:25 -0400
+ by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id pALK6a31031355;
+ Mon, 21 Nov 2011 15:06:36 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:09:53 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:09:51 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:01:56 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:01:55 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 10/31] ptrace: take ->siglock around s/TRACED/RUNNING/
-Message-ID: <20110803190951.GA30949 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 10/33] ptrace: take ->siglock around s/TRACED/RUNNING/
+Message-ID: <20111121200155.GA27801 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
Status: RO
Content-Length: 1624
Lines: 56
@@ -4851,7 +4787,7 @@ Signed-off-by: Oleg Nesterov <oleg at redhat.com>
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 9de3ecf..56b8fc1 100644
+index 24d0447..daf47bc 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -589,6 +589,8 @@ static int ptrace_setsiginfo(struct task_struct *child, const siginfo_t *info)
@@ -4877,10 +4813,10 @@ index 9de3ecf..56b8fc1 100644
return 0;
}
diff --git a/kernel/signal.c b/kernel/signal.c
-index 0f9af0b..71f5cca 100644
+index 8594cb2..4512bb4 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
-@@ -1878,7 +1878,10 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
+@@ -1886,7 +1886,10 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
if (gstop_done)
do_notify_parent_cldstop(current, false, why);
@@ -4895,47 +4831,40 @@ index 0f9af0b..71f5cca 100644
1.5.5.1
-From davej Wed Aug 3 15:16:37 2011
+From oleg at redhat.com Mon Nov 21 15:06:40 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:37 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
- zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:29 -0400 (EDT)
+Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
+ zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:40 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 5034E9DEA4;
- Wed, 3 Aug 2011 15:12:35 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id 8BhFlmqmXy8l; Wed, 3 Aug 2011 15:12:35 -0400 (EDT)
-Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 31AEE9DEAB;
- Wed, 3 Aug 2011 15:12:35 -0400 (EDT)
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id B0D19D877F;
+ Mon, 21 Nov 2011 15:06:40 -0500 (EST)
+Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id 3jv-cDBpMP5B; Mon, 21 Nov 2011 15:06:40 -0500 (EST)
+Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 9C98DD8410;
+ Mon, 21 Nov 2011 15:06:40 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCRCZ008434;
- Wed, 3 Aug 2011 15:12:28 -0400
+ by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id pALK6cHF029573;
+ Mon, 21 Nov 2011 15:06:39 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:09:55 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:09:53 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:01:59 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:01:57 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 11/31] introduce wake_up_quiescent()
-Message-ID: <20110803190953.GA30952 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 11/33] introduce wake_up_quiescent()
+Message-ID: <20111121200157.GA27805 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
Status: RO
Content-Length: 3186
Lines: 93
@@ -4968,7 +4897,7 @@ index a822300..2be3712 100644
extern int do_send_sig_info(int sig, struct siginfo *info,
struct task_struct *p, bool group);
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 56b8fc1..4194664 100644
+index daf47bc..8439ef1 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -621,7 +621,7 @@ static int ptrace_resume(struct task_struct *child, long request,
@@ -4981,7 +4910,7 @@ index 56b8fc1..4194664 100644
}
diff --git a/kernel/signal.c b/kernel/signal.c
-index 71f5cca..3e8e0b1 100644
+index 4512bb4..99a6008 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -702,6 +702,14 @@ void signal_wake_up(struct task_struct *t, int resume)
@@ -5008,7 +4937,7 @@ index 71f5cca..3e8e0b1 100644
else
ptrace_trap_notify(t);
} while_each_thread(p, t);
-@@ -1879,7 +1887,7 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
+@@ -1887,7 +1895,7 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
do_notify_parent_cldstop(current, false, why);
spin_lock_irq(¤t->sighand->siglock);
@@ -5034,49 +4963,42 @@ index 5d3974e..cebc390 100644
1.5.5.1
-From davej Wed Aug 3 15:22:01 2011
+From oleg at redhat.com Mon Nov 21 15:06:43 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:22:01 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
- zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:17:15 -0400 (EDT)
+Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
+ zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:43 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id F2DE19DC07;
- Wed, 3 Aug 2011 15:12:37 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id IYfqfx8GhNWc; Wed, 3 Aug 2011 15:12:37 -0400 (EDT)
-Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D645E9DAF7;
- Wed, 3 Aug 2011 15:12:37 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 6488BD514C;
+ Mon, 21 Nov 2011 15:06:43 -0500 (EST)
+Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id TKQUj5mU4NYM; Mon, 21 Nov 2011 15:06:43 -0500 (EST)
+Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 4EC82D5000;
+ Mon, 21 Nov 2011 15:06:43 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCUNh008446;
- Wed, 3 Aug 2011 15:12:31 -0400
+ by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK6fp6015343;
+ Mon, 21 Nov 2011 15:06:41 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:09:58 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:09:56 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:02 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:01:59 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 12/31] introduce ptrace_signal_wake_up()
-Message-ID: <20110803190956.GA30959 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 12/33] introduce ptrace_signal_wake_up()
+Message-ID: <20111121200159.GA27812 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
Status: RO
-Content-Length: 3667
+Content-Length: 3670
Lines: 113
Add the new helper, ptrace_signal_wake_up(), change ptrace.c/signal.c
@@ -5118,7 +5040,7 @@ index 800f113..6d9282a 100644
extern long arch_ptrace(struct task_struct *child, long request,
unsigned long addr, unsigned long data);
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 4194664..1a50090 100644
+index 8439ef1..a464ab5 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -25,6 +25,18 @@
@@ -5167,7 +5089,7 @@ index 4194664..1a50090 100644
unlock_task_sighand(child, &flags);
ret = 0;
-@@ -760,7 +772,7 @@ int ptrace_request(struct task_struct *child, long request,
+@@ -757,7 +769,7 @@ int ptrace_request(struct task_struct *child, long request,
* start of this trap and now. Trigger re-trap.
*/
if (child->jobctl & JOBCTL_TRAP_NOTIFY)
@@ -5177,7 +5099,7 @@ index 4194664..1a50090 100644
}
unlock_task_sighand(child, &flags);
diff --git a/kernel/signal.c b/kernel/signal.c
-index 3e8e0b1..0dc6abb 100644
+index 99a6008..7a47a93 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -854,7 +854,7 @@ static void ptrace_trap_notify(struct task_struct *t)
@@ -5193,48 +5115,41 @@ index 3e8e0b1..0dc6abb 100644
1.5.5.1
-From davej Wed Aug 3 15:15:58 2011
+From oleg at redhat.com Mon Nov 21 15:06:46 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:15:58 -0400 (EDT)
Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:13:17 -0400 (EDT)
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:46 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 8FF88DA558;
- Wed, 3 Aug 2011 15:12:40 -0400 (EDT)
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 3A7AED8410;
+ Mon, 21 Nov 2011 15:06:46 -0500 (EST)
Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id 1cOfIyuaRoO3; Wed, 3 Aug 2011 15:12:40 -0400 (EDT)
-Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
- by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 7B6E8DA4A9;
- Wed, 3 Aug 2011 15:12:40 -0400 (EDT)
+ with ESMTP id jhYAwDyYmdhg; Mon, 21 Nov 2011 15:06:46 -0500 (EST)
+Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 25D5FD889A;
+ Mon, 21 Nov 2011 15:06:46 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCXpn023459;
- Wed, 3 Aug 2011 15:12:33 -0400
+ by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id pALK6h29029619;
+ Mon, 21 Nov 2011 15:06:44 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:01 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:09:59 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:04 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:02 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 13/31] wait_task_inactive: treat task->state and
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 13/33] wait_task_inactive: treat task->state and
match_state as bitmasks
-Message-ID: <20110803190959.GA30962 at redhat.com>
+Message-ID: <20111121200202.GA27816 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
Status: RO
Content-Length: 1558
Lines: 39
@@ -5263,10 +5178,10 @@ Signed-off-by: Oleg Nesterov <oleg at redhat.com>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c
-index ccacdbd..66ef2fb 100644
+index 0e9344a..84ecc0a 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -2289,7 +2289,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
+@@ -2443,7 +2443,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
* is actually now running somewhere else!
*/
while (task_running(rq, p)) {
@@ -5279,47 +5194,40 @@ index ccacdbd..66ef2fb 100644
1.5.5.1
-From davej Wed Aug 3 15:16:24 2011
+From oleg at redhat.com Mon Nov 21 15:06:48 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:24 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
- zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:21 -0400 (EDT)
+Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
+ zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:48 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 34C189DC30;
- Wed, 3 Aug 2011 15:12:43 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id RHggq6bqo+Q9; Wed, 3 Aug 2011 15:12:43 -0400 (EDT)
-Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 210D59DC14;
- Wed, 3 Aug 2011 15:12:43 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id C2934D5000;
+ Mon, 21 Nov 2011 15:06:48 -0500 (EST)
+Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id ThT2PyhztDpQ; Mon, 21 Nov 2011 15:06:48 -0500 (EST)
+Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id ACE02D4F84;
+ Mon, 21 Nov 2011 15:06:48 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p73JCZsD022395;
- Wed, 3 Aug 2011 15:12:36 -0400
+ by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK6kdb022201;
+ Mon, 21 Nov 2011 15:06:47 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:03 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:01 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:07 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:05 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 14/31] introduce TASK_UTRACED state
-Message-ID: <20110803191001.GA30969 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 14/33] introduce TASK_UTRACED state
+Message-ID: <20111121200205.GA27823 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
Status: RO
Content-Length: 2913
Lines: 84
@@ -5358,10 +5266,10 @@ index f0c0ea2..e0daec4 100644
static inline const char *get_task_state(struct task_struct *tsk)
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index c6d79af..f3f0a77 100644
+index 4d45f93..746b4d3 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
-@@ -184,16 +184,17 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
+@@ -185,16 +185,17 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
#define TASK_UNINTERRUPTIBLE 2
#define __TASK_STOPPED 4
#define __TASK_TRACED 8
@@ -5386,7 +5294,7 @@ index c6d79af..f3f0a77 100644
extern char ___assert_task_state[1 - 2*!!(
sizeof(TASK_STATE_TO_CHAR_STR)-1 != ilog2(TASK_STATE_MAX)+1)];
-@@ -202,15 +203,16 @@ extern char ___assert_task_state[1 - 2*!!(
+@@ -203,15 +204,16 @@ extern char ___assert_task_state[1 - 2*!!(
#define TASK_KILLABLE (TASK_WAKEKILL | TASK_UNINTERRUPTIBLE)
#define TASK_STOPPED (TASK_WAKEKILL | __TASK_STOPPED)
#define TASK_TRACED (TASK_WAKEKILL | __TASK_TRACED)
@@ -5409,47 +5317,40 @@ index c6d79af..f3f0a77 100644
1.5.5.1
-From davej Wed Aug 3 15:16:02 2011
+From oleg at redhat.com Mon Nov 21 15:06:51 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:02 -0400 (EDT)
Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:13:18 -0400 (EDT)
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:51 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D7FFADA44E;
- Wed, 3 Aug 2011 15:12:45 -0400 (EDT)
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 48F35D889C;
+ Mon, 21 Nov 2011 15:06:51 -0500 (EST)
Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id LFGdvSMswLJT; Wed, 3 Aug 2011 15:12:45 -0400 (EDT)
-Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
- by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id BA46CDA441;
- Wed, 3 Aug 2011 15:12:45 -0400 (EDT)
+ with ESMTP id ZXkDvXaDg0cN; Mon, 21 Nov 2011 15:06:51 -0500 (EST)
+Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 34485D889A;
+ Mon, 21 Nov 2011 15:06:51 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCcpZ029424;
- Wed, 3 Aug 2011 15:12:39 -0400
+ by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK6nlT022211;
+ Mon, 21 Nov 2011 15:06:49 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:06 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:04 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:09 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:08 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 15/31] utrace: use TASK_UTRACED instead of TASK_TRACED
-Message-ID: <20110803191004.GA30972 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 15/33] utrace: use TASK_UTRACED instead of TASK_TRACED
+Message-ID: <20111121200208.GA27826 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
Status: RO
Content-Length: 4316
Lines: 130
@@ -5585,48 +5486,41 @@ index cebc390..2097103 100644
1.5.5.1
-From davej Wed Aug 3 15:21:40 2011
+From oleg at redhat.com Mon Nov 21 15:06:53 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:21:40 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:42 -0400 (EDT)
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:53 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 7035E9DECC;
- Wed, 3 Aug 2011 15:12:48 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id B8F54D5296;
+ Mon, 21 Nov 2011 15:06:53 -0500 (EST)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id rmRalMQFlNua; Wed, 3 Aug 2011 15:12:48 -0400 (EDT)
-Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 5CC809DEC9;
- Wed, 3 Aug 2011 15:12:48 -0400 (EDT)
+ with ESMTP id PX4Y3H1mw0hD; Mon, 21 Nov 2011 15:06:53 -0500 (EST)
+Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id A4B5CD528E;
+ Mon, 21 Nov 2011 15:06:53 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p73JCfwv010344;
- Wed, 3 Aug 2011 15:12:41 -0400
+ by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id pALK6pXd029643;
+ Mon, 21 Nov 2011 15:06:52 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:09 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:07 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:12 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:10 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 16/31] reintroduce tracehook_finish_jctl() as
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 16/33] reintroduce tracehook_finish_jctl() as
utrace_end_stop()
-Message-ID: <20110803191007.GA30979 at redhat.com>
+Message-ID: <20111121200210.GA27829 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
Status: RO
Content-Length: 2401
Lines: 77
@@ -5670,10 +5564,10 @@ index cf13839..0279c74 100644
+
#endif /* linux/utrace.h */
diff --git a/kernel/signal.c b/kernel/signal.c
-index 0dc6abb..a625309 100644
+index 7a47a93..ba46eab 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
-@@ -1895,6 +1895,8 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
+@@ -1903,6 +1903,8 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
read_unlock(&tasklist_lock);
}
@@ -5682,7 +5576,7 @@ index 0dc6abb..a625309 100644
/*
* While in TASK_TRACED, we were considered "frozen enough".
* Now that we woke up, it's crucial if we're supposed to be
-@@ -2059,6 +2061,9 @@ static bool do_signal_stop(int signr)
+@@ -2067,6 +2069,9 @@ static bool do_signal_stop(int signr)
/* Now we don't run again until woken by SIGCONT or SIGKILL */
schedule();
@@ -5709,47 +5603,40 @@ index 2097103..d41b982 100644
1.5.5.1
-From davej Wed Aug 3 15:21:41 2011
+From oleg at redhat.com Mon Nov 21 15:06:56 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:21:41 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
- zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:42 -0400 (EDT)
+Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
+ zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:56 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 153719DD18;
- Wed, 3 Aug 2011 15:12:51 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id ffM0oM8RRtgL; Wed, 3 Aug 2011 15:12:51 -0400 (EDT)
-Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 0253E9DEC9;
- Wed, 3 Aug 2011 15:12:51 -0400 (EDT)
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 4A487D83A1;
+ Mon, 21 Nov 2011 15:06:56 -0500 (EST)
+Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id 3vHogPyhojlJ; Mon, 21 Nov 2011 15:06:56 -0500 (EST)
+Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 358A0D88B0;
+ Mon, 21 Nov 2011 15:06:56 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCh9Z023559;
- Wed, 3 Aug 2011 15:12:44 -0400
+ by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK6sHk017679;
+ Mon, 21 Nov 2011 15:06:54 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:11 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:09 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:14 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:12 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 17/31] teach wake_up_quiescent() to do "selective" wake_up
-Message-ID: <20110803191009.GA30982 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 17/33] teach wake_up_quiescent() to do "selective" wake_up
+Message-ID: <20111121200212.GA27836 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22
Status: RO
Content-Length: 1335
Lines: 46
@@ -5767,7 +5654,7 @@ Signed-off-by: Oleg Nesterov <oleg at redhat.com>
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/kernel/signal.c b/kernel/signal.c
-index a625309..0d1675a 100644
+index ba46eab..e06f795 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -701,11 +701,26 @@ void signal_wake_up(struct task_struct *t, int resume)
@@ -5801,48 +5688,41 @@ index a625309..0d1675a 100644
1.5.5.1
-From davej Wed Aug 3 15:21:43 2011
+From oleg at redhat.com Mon Nov 21 15:06:59 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:21:43 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:43 -0400 (EDT)
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:06:58 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id B0E899DECF;
- Wed, 3 Aug 2011 15:12:53 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id C88E2D528B;
+ Mon, 21 Nov 2011 15:06:58 -0500 (EST)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id s0bDFhAmsQWN; Wed, 3 Aug 2011 15:12:53 -0400 (EDT)
-Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 9DC6E9DEC9;
- Wed, 3 Aug 2011 15:12:53 -0400 (EDT)
+ with ESMTP id nNrAxBD5KOME; Mon, 21 Nov 2011 15:06:58 -0500 (EST)
+Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id B2114D51C1;
+ Mon, 21 Nov 2011 15:06:58 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCkUr029453;
- Wed, 3 Aug 2011 15:12:46 -0400
+ by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id pALK6uQQ031440;
+ Mon, 21 Nov 2011 15:06:57 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:14 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:12 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:17 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:15 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 18/31] ptrace_stop: do not assume the task is running after
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 18/33] ptrace_stop: do not assume the task is running after
wake_up_quiescent()
-Message-ID: <20110803191012.GA30985 at redhat.com>
+Message-ID: <20111121200215.GA27839 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
Status: RO
Content-Length: 956
Lines: 31
@@ -5857,10 +5737,10 @@ Signed-off-by: Oleg Nesterov <oleg at redhat.com>
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/kernel/signal.c b/kernel/signal.c
-index 0d1675a..249760f 100644
+index e06f795..9348da6 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
-@@ -1908,6 +1908,14 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
+@@ -1916,6 +1916,14 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
if (clear_code)
current->exit_code = 0;
read_unlock(&tasklist_lock);
@@ -5879,48 +5759,41 @@ index 0d1675a..249760f 100644
1.5.5.1
-From davej Wed Aug 3 15:16:26 2011
+From oleg at redhat.com Mon Nov 21 15:07:01 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:26 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
- zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:22 -0400 (EDT)
+Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
+ zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:01 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 69B489DC62;
- Wed, 3 Aug 2011 15:12:56 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id 4BNNeoYSdCTc; Wed, 3 Aug 2011 15:12:56 -0400 (EDT)
-Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 4A9899DC14;
- Wed, 3 Aug 2011 15:12:56 -0400 (EDT)
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 4BF37D889A;
+ Mon, 21 Nov 2011 15:07:01 -0500 (EST)
+Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id 5p8tvlXAqUHr; Mon, 21 Nov 2011 15:07:01 -0500 (EST)
+Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 37C22D8757;
+ Mon, 21 Nov 2011 15:07:01 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCnRf023575;
- Wed, 3 Aug 2011 15:12:49 -0400
+ by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id pALK6xFJ031449;
+ Mon, 21 Nov 2011 15:06:59 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:16 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:14 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:19 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:18 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 19/31] get_signal_to_deliver: restore/restructure
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 19/33] get_signal_to_deliver: restore/restructure
utrace/ptrace signal reporting
-Message-ID: <20110803191014.GA30992 at redhat.com>
+Message-ID: <20111121200218.GA27846 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
Status: RO
Content-Length: 3556
Lines: 115
@@ -5986,10 +5859,10 @@ index 0279c74..63103e2 100644
+
#endif /* linux/utrace.h */
diff --git a/kernel/signal.c b/kernel/signal.c
-index 249760f..3c783d3 100644
+index 9348da6..38ea4e6 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
-@@ -2234,17 +2234,27 @@ relock:
+@@ -2242,17 +2242,27 @@ relock:
for (;;) {
struct k_sigaction *ka;
@@ -6025,7 +5898,7 @@ index 249760f..3c783d3 100644
if (!signr)
break; /* will return 0 */
-@@ -2254,9 +2264,9 @@ relock:
+@@ -2262,9 +2272,9 @@ relock:
regs, cookie);
if (!signr)
continue;
@@ -6041,46 +5914,39 @@ index 249760f..3c783d3 100644
1.5.5.1
-From davej Wed Aug 3 15:16:27 2011
+From oleg at redhat.com Mon Nov 21 15:07:03 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:27 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
- zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:22 -0400 (EDT)
+Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
+ zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:03 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 119589DC72;
- Wed, 3 Aug 2011 15:12:59 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id Vxp8fnt8hEcf; Wed, 3 Aug 2011 15:12:59 -0400 (EDT)
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id CB362D89E9;
+ Mon, 21 Nov 2011 15:07:03 -0500 (EST)
+Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id wm2JqccPnhsV; Mon, 21 Nov 2011 15:07:03 -0500 (EST)
Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id F22049DCAE;
- Wed, 3 Aug 2011 15:12:58 -0400 (EDT)
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id B6D25D89DE;
+ Mon, 21 Nov 2011 15:07:03 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p73JCpO4010401;
- Wed, 3 Aug 2011 15:12:52 -0400
+ by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id pALK715f031455;
+ Mon, 21 Nov 2011 15:07:02 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:19 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:17 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:22 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:20 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 20/31] utrace_get_signal:
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 20/33] utrace_get_signal:
s/JOBCTL_STOP_PENDING/JOBCTL_PENDING_MASK/
-Message-ID: <20110803191017.GA30995 at redhat.com>
+Message-ID: <20111121200220.GA27849 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
Status: RO
@@ -6121,47 +5987,40 @@ index d41b982..0bb0a06 100644
1.5.5.1
-From davej Wed Aug 3 15:16:03 2011
+From oleg at redhat.com Mon Nov 21 15:07:07 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:03 -0400 (EDT)
-Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
- zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:13:19 -0400 (EDT)
+Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
+ zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:06 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id A9253DA3CB;
- Wed, 3 Aug 2011 15:13:01 -0400 (EDT)
-Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id HLlRhTJ2MbYS; Wed, 3 Aug 2011 15:13:01 -0400 (EDT)
-Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
- by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 9582C4C43B;
- Wed, 3 Aug 2011 15:13:01 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 8C14BD4F84;
+ Mon, 21 Nov 2011 15:07:06 -0500 (EST)
+Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id 39eM-KKZxrZ3; Mon, 21 Nov 2011 15:07:06 -0500 (EST)
+Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 7628FD4FF4;
+ Mon, 21 Nov 2011 15:07:06 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCsFX008586;
- Wed, 3 Aug 2011 15:12:54 -0400
+ by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK74dN022253;
+ Mon, 21 Nov 2011 15:07:04 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:22 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:20 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:25 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:23 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 21/31] introduce ptrace_set_syscall_trace()
-Message-ID: <20110803191020.GA31002 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 21/33] introduce ptrace_set_syscall_trace()
+Message-ID: <20111121200223.GA27856 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
Status: RO
Content-Length: 1549
Lines: 52
@@ -6176,7 +6035,7 @@ Signed-off-by: Oleg Nesterov <oleg at redhat.com>
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 1a50090..dc2ad34 100644
+index a464ab5..43357e5 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -38,6 +38,14 @@ void ptrace_signal_wake_up(struct task_struct *p, int quiescent)
@@ -6219,47 +6078,40 @@ index 1a50090..dc2ad34 100644
1.5.5.1
-From davej Wed Aug 3 15:21:45 2011
+From oleg at redhat.com Mon Nov 21 15:07:09 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:21:45 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
- zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:43 -0400 (EDT)
+Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
+ zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:09 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 5C4889DEE6;
- Wed, 3 Aug 2011 15:13:04 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id eXIPU4nVv+7Z; Wed, 3 Aug 2011 15:13:04 -0400 (EDT)
-Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 3F82C9DED6;
- Wed, 3 Aug 2011 15:13:04 -0400 (EDT)
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 1ADF01285E4;
+ Mon, 21 Nov 2011 15:07:09 -0500 (EST)
+Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id rF+XegsxVXnL; Mon, 21 Nov 2011 15:07:09 -0500 (EST)
+Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 067E41287D0;
+ Mon, 21 Nov 2011 15:07:09 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCueo029507;
- Wed, 3 Aug 2011 15:12:57 -0400
+ by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK76tD022270;
+ Mon, 21 Nov 2011 15:07:07 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:24 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:22 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:27 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:25 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 22/31] introduce PT_SYSCALL_TRACE flag
-Message-ID: <20110803191022.GA31005 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 22/33] introduce PT_SYSCALL_TRACE flag
+Message-ID: <20111121200225.GA27860 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
Status: RO
Content-Length: 2268
Lines: 73
@@ -6315,7 +6167,7 @@ index ec2af67..eb9fe30 100644
ptrace_notify(SIGTRAP | ((ptrace & PT_TRACESYSGOOD) ? 0x80 : 0));
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index dc2ad34..7deb292 100644
+index 43357e5..1ac03eb 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -40,10 +40,13 @@ void ptrace_signal_wake_up(struct task_struct *p, int quiescent)
@@ -6338,48 +6190,41 @@ index dc2ad34..7deb292 100644
1.5.5.1
-From davej Wed Aug 3 15:16:05 2011
+From oleg at redhat.com Mon Nov 21 15:07:11 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:05 -0400 (EDT)
-Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
- zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:13:20 -0400 (EDT)
+Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
+ zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:11 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id E516ADA488;
- Wed, 3 Aug 2011 15:13:06 -0400 (EDT)
-Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id rP7Um8DZjclX; Wed, 3 Aug 2011 15:13:06 -0400 (EDT)
-Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
- by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D155EDA3F8;
- Wed, 3 Aug 2011 15:13:06 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id B7D62D4DCC;
+ Mon, 21 Nov 2011 15:07:11 -0500 (EST)
+Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id 1ENpGO166I-W; Mon, 21 Nov 2011 15:07:11 -0500 (EST)
+Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id A3A55D498A;
+ Mon, 21 Nov 2011 15:07:11 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JCxfF029532;
- Wed, 3 Aug 2011 15:13:00 -0400
+ by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK79AS017728;
+ Mon, 21 Nov 2011 15:07:10 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:27 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:25 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:30 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:28 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 23/31] utrace: don't clear TIF_SYSCALL_TRACE if it is
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 23/33] utrace: don't clear TIF_SYSCALL_TRACE if it is
needed by ptrace
-Message-ID: <20110803191025.GA31012 at redhat.com>
+Message-ID: <20111121200228.GA27863 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22
Status: RO
Content-Length: 797
Lines: 24
@@ -6409,47 +6254,40 @@ index 0bb0a06..bebf6de 100644
1.5.5.1
-From davej Wed Aug 3 15:16:08 2011
+From oleg at redhat.com Mon Nov 21 15:07:14 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:08 -0400 (EDT)
Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:15:29 -0400 (EDT)
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:14 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 80872DA4B2;
- Wed, 3 Aug 2011 15:13:09 -0400 (EDT)
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 5376AD8774;
+ Mon, 21 Nov 2011 15:07:14 -0500 (EST)
Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id AbpC0Wk1ZhtT; Wed, 3 Aug 2011 15:13:09 -0400 (EDT)
-Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
- by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 6D97DDA3F8;
- Wed, 3 Aug 2011 15:13:09 -0400 (EDT)
+ with ESMTP id 5Oc8ErfFfJSs; Mon, 21 Nov 2011 15:07:14 -0500 (EST)
+Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 3F2CFD81E9;
+ Mon, 21 Nov 2011 15:07:14 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p73JD2RU022591;
- Wed, 3 Aug 2011 15:13:02 -0400
+ by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK7Cw3015467;
+ Mon, 21 Nov 2011 15:07:12 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:30 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:28 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:32 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:30 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 24/31] introduce task_utrace_lock/task_utrace_unlock
-Message-ID: <20110803191028.GA31015 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 24/33] introduce task_utrace_lock/task_utrace_unlock
+Message-ID: <20111121200230.GA27870 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
Status: RO
Content-Length: 2190
Lines: 81
@@ -6536,48 +6374,41 @@ index bebf6de..960dd9e 100644
1.5.5.1
-From davej Wed Aug 3 15:21:46 2011
+From oleg at redhat.com Mon Nov 21 15:07:17 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:21:46 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:43 -0400 (EDT)
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:17 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 24B3E9DEF6;
- Wed, 3 Aug 2011 15:13:12 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 01034D498A;
+ Mon, 21 Nov 2011 15:07:17 -0500 (EST)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id 2jg9j3-p4bHL; Wed, 3 Aug 2011 15:13:12 -0400 (EDT)
-Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 119759DEF9;
- Wed, 3 Aug 2011 15:13:12 -0400 (EDT)
+ with ESMTP id BglmrU3H2hJr; Mon, 21 Nov 2011 15:07:16 -0500 (EST)
+Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id E0D31D4FF4;
+ Mon, 21 Nov 2011 15:07:16 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p73JD485022603;
- Wed, 3 Aug 2011 15:13:05 -0400
+ by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK7Egx015474;
+ Mon, 21 Nov 2011 15:07:15 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:32 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:30 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:35 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:33 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 25/31] teach ptrace_set_syscall_trace() to play well with
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 25/33] teach ptrace_set_syscall_trace() to play well with
utrace
-Message-ID: <20110803191030.GA31018 at redhat.com>
+Message-ID: <20111121200233.GA27873 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
Status: RO
Content-Length: 1545
Lines: 49
@@ -6599,7 +6430,7 @@ Signed-off-by: Oleg Nesterov <oleg at redhat.com>
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 7deb292..69850e9 100644
+index 1ac03eb..739183a 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -24,6 +24,7 @@
@@ -6632,45 +6463,38 @@ index 7deb292..69850e9 100644
1.5.5.1
-From davej Wed Aug 3 15:16:29 2011
+From oleg at redhat.com Mon Nov 21 15:07:19 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:28 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:24 -0400 (EDT)
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:19 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 062709DE55;
- Wed, 3 Aug 2011 15:13:15 -0400 (EDT)
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 8F87F128EAA;
+ Mon, 21 Nov 2011 15:07:19 -0500 (EST)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id lhwVoEywGaPJ; Wed, 3 Aug 2011 15:13:14 -0400 (EDT)
+ with ESMTP id yittEjCd+X4F; Mon, 21 Nov 2011 15:07:19 -0500 (EST)
Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id E4C139DE11;
- Wed, 3 Aug 2011 15:13:14 -0400 (EDT)
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 7BC701287D0;
+ Mon, 21 Nov 2011 15:07:19 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p73JD7Go010523;
- Wed, 3 Aug 2011 15:13:08 -0400
+ by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id pALK7HbH031553;
+ Mon, 21 Nov 2011 15:07:18 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:35 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:33 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:38 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:36 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 26/31] introduce PT_SINGLE_STEP and PT_SINGLE_BLOCK
-Message-ID: <20110803191033.GA31025 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 26/33] introduce PT_SINGLE_STEP and PT_SINGLE_BLOCK
+Message-ID: <20111121200236.GA27880 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
Status: RO
@@ -6762,7 +6586,7 @@ index eb9fe30..21c8ca2 100644
}
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 69850e9..d250a71 100644
+index 739183a..792080d 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -630,13 +630,16 @@ static int ptrace_resume(struct task_struct *child, long request,
@@ -6786,48 +6610,41 @@ index 69850e9..d250a71 100644
1.5.5.1
-From davej Wed Aug 3 15:16:30 2011
+From oleg at redhat.com Mon Nov 21 15:07:22 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:30 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:25 -0400 (EDT)
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:22 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id B3BF49DE11;
- Wed, 3 Aug 2011 15:13:17 -0400 (EDT)
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 0C136128FB0;
+ Mon, 21 Nov 2011 15:07:22 -0500 (EST)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id zC72ecV9Jz07; Wed, 3 Aug 2011 15:13:17 -0400 (EDT)
-Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 98ACE9DE59;
- Wed, 3 Aug 2011 15:13:17 -0400 (EDT)
+ with ESMTP id GNbS20gY5Jq9; Mon, 21 Nov 2011 15:07:21 -0500 (EST)
+Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id EB5821287D0;
+ Mon, 21 Nov 2011 15:07:21 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JDATh023726;
- Wed, 3 Aug 2011 15:13:10 -0400
+ by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id pALK7Kn1029766;
+ Mon, 21 Nov 2011 15:07:20 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:38 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:36 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:40 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:38 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 27/31] utrace: finish_resume_report: don't do
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 27/33] utrace: finish_resume_report: don't do
user_xxx_step() if ptrace_wants_step()
-Message-ID: <20110803191036.GA31028 at redhat.com>
+Message-ID: <20111121200238.GA27883 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
Status: RO
Content-Length: 2741
Lines: 84
@@ -6917,48 +6734,41 @@ index 960dd9e..05e8532 100644
1.5.5.1
-From davej Wed Aug 3 15:16:32 2011
+From oleg at redhat.com Mon Nov 21 15:07:24 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:32 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:25 -0400 (EDT)
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:24 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 614CD9DE73;
- Wed, 3 Aug 2011 15:13:20 -0400 (EDT)
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 8954F12914D;
+ Mon, 21 Nov 2011 15:07:24 -0500 (EST)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id jcWOXzUaaIYu; Wed, 3 Aug 2011 15:13:20 -0400 (EDT)
-Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 438889DE59;
- Wed, 3 Aug 2011 15:13:20 -0400 (EDT)
+ with ESMTP id 0lU8wXKC78yu; Mon, 21 Nov 2011 15:07:24 -0500 (EST)
+Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 759B61287D0;
+ Mon, 21 Nov 2011 15:07:24 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JDDZ7029595;
- Wed, 3 Aug 2011 15:13:13 -0400
+ by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK7Mi7022329;
+ Mon, 21 Nov 2011 15:07:23 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:40 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:38 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:43 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:41 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 28/31] ptrace: shift user_*_step() from ptrace_resume() to
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 28/33] ptrace: shift user_*_step() from ptrace_resume() to
ptrace_stop()
-Message-ID: <20110803191038.GA31035 at redhat.com>
+Message-ID: <20111121200241.GA27890 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
Status: RO
Content-Length: 2374
Lines: 70
@@ -6990,7 +6800,7 @@ Signed-off-by: Oleg Nesterov <oleg at redhat.com>
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index d250a71..d1ef124 100644
+index 792080d..eba9a22 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -635,14 +635,10 @@ static int ptrace_resume(struct task_struct *child, long request,
@@ -7009,10 +6819,10 @@ index d250a71..d1ef124 100644
child->exit_code = data;
diff --git a/kernel/signal.c b/kernel/signal.c
-index 3c783d3..43a3e77 100644
+index 38ea4e6..b13d2bc 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
-@@ -1920,6 +1920,17 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
+@@ -1928,6 +1928,17 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
utrace_end_stop();
@@ -7034,45 +6844,38 @@ index 3c783d3..43a3e77 100644
1.5.5.1
-From davej Wed Aug 3 15:16:34 2011
+From oleg at redhat.com Mon Nov 21 15:07:27 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:16:34 -0400 (EDT)
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:25 -0400 (EDT)
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:27 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 1A6019DE59;
- Wed, 3 Aug 2011 15:13:23 -0400 (EDT)
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 043581287D0;
+ Mon, 21 Nov 2011 15:07:27 -0500 (EST)
Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id db2hhAqFwsPu; Wed, 3 Aug 2011 15:13:23 -0400 (EDT)
+ with ESMTP id 4WO1El1jiIrJ; Mon, 21 Nov 2011 15:07:26 -0500 (EST)
Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 034739DE83;
- Wed, 3 Aug 2011 15:13:23 -0400 (EDT)
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id E3FCA129045;
+ Mon, 21 Nov 2011 15:07:26 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JDFNp008715;
- Wed, 3 Aug 2011 15:13:16 -0400
+ by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK7OdV017836;
+ Mon, 21 Nov 2011 15:07:25 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:43 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:41 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:45 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:43 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 29/31] ptrace_disable: no need to disable stepping
-Message-ID: <20110803191041.GA31039 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 29/33] ptrace_disable: no need to disable stepping
+Message-ID: <20111121200243.GA27893 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22
Status: RO
@@ -7109,47 +6912,40 @@ index d1557dc..96d315a 100644
1.5.5.1
-From davej Wed Aug 3 15:21:48 2011
+From oleg at redhat.com Mon Nov 21 15:07:29 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:21:48 -0400 (EDT)
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:52 -0400 (EDT)
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:29 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 95706917AF;
- Wed, 3 Aug 2011 15:13:25 -0400 (EDT)
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 8A6E8D4C39;
+ Mon, 21 Nov 2011 15:07:29 -0500 (EST)
Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id ctq4DF3wXncJ; Wed, 3 Aug 2011 15:13:25 -0400 (EDT)
-Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 7FD14914AF;
- Wed, 3 Aug 2011 15:13:25 -0400 (EDT)
+ with ESMTP id NLURBx2yQes5; Mon, 21 Nov 2011 15:07:29 -0500 (EST)
+Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
+ by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 7660DD498A;
+ Mon, 21 Nov 2011 15:07:29 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p73JDIRO010579;
- Wed, 3 Aug 2011 15:13:18 -0400
+ by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK7RnP015578;
+ Mon, 21 Nov 2011 15:07:27 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:46 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:44 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:48 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:46 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 30/31] ptrace_report_syscall: check TIF_SYSCALL_EMU
-Message-ID: <20110803191044.GA31046 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 30/33] ptrace_report_syscall: check TIF_SYSCALL_EMU
+Message-ID: <20111121200246.GA27896 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
Status: RO
Content-Length: 858
Lines: 28
@@ -7183,46 +6979,39 @@ index b6812d4..90ca578 100644
1.5.5.1
-From davej Wed Aug 3 15:21:49 2011
+From oleg at redhat.com Mon Nov 21 15:07:32 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Wed, 03 Aug 2011 15:21:49 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
- zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Wed, 3 Aug 2011 15:16:52 -0400 (EDT)
+Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
+ zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:32 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 400F49191F;
- Wed, 3 Aug 2011 15:13:28 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id UeLOLM29JRc7; Wed, 3 Aug 2011 15:13:28 -0400 (EDT)
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 10D1312916C;
+ Mon, 21 Nov 2011 15:07:32 -0500 (EST)
+Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id Z14plX1oxaYL; Mon, 21 Nov 2011 15:07:32 -0500 (EST)
Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 2D05C903F6;
- Wed, 3 Aug 2011 15:13:28 -0400 (EDT)
+ by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id F12FF128E1D;
+ Mon, 21 Nov 2011 15:07:31 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id p73JDKCA023784;
- Wed, 3 Aug 2011 15:13:21 -0400
+ by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK7T0q022460;
+ Mon, 21 Nov 2011 15:07:30 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Wed, 3 Aug 2011 21:10:48 +0200 (CEST)
-Date: Wed, 3 Aug 2011 21:10:46 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:50 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:48 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH 31/31] utrace_resume: check irqs_disabled() to shut up
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 31/33] utrace_resume: check irqs_disabled() to shut up
lockdep
-Message-ID: <20110803191046.GA31049 at redhat.com>
+Message-ID: <20111121200248.GA27903 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
Status: RO
@@ -7256,49 +7045,41 @@ index 05e8532..c817a46 100644
1.5.5.1
-From davej Tue Aug 9 13:39:54 2011
+From oleg at redhat.com Mon Nov 21 15:07:34 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.51]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Tue, 09 Aug 2011 13:39:54 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
- zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by
- mail04.corp.redhat.com with LMTP; Tue, 9 Aug 2011 13:39:44 -0400 (EDT)
+Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
+ zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:34 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 5FCAC12983C;
- Tue, 9 Aug 2011 13:39:44 -0400 (EDT)
-Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id nDWbqog6fbHK; Tue, 9 Aug 2011 13:39:44 -0400 (EDT)
-Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
- by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 4BEF712983B;
- Tue, 9 Aug 2011 13:39:44 -0400 (EDT)
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 860BCD8A3E;
+ Mon, 21 Nov 2011 15:07:34 -0500 (EST)
+Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id pVTbN1oF62dg; Mon, 21 Nov 2011 15:07:34 -0500 (EST)
+Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 6FBFFD87A3;
+ Mon, 21 Nov 2011 15:07:34 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p79HdahY022801;
- Tue, 9 Aug 2011 13:39:37 -0400
+ by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id pALK7W0B029871;
+ Mon, 21 Nov 2011 15:07:32 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Tue, 9 Aug 2011 19:36:58 +0200 (CEST)
-Date: Tue, 9 Aug 2011 19:36:56 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:53 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:51 +0100
From: Oleg Nesterov <oleg at redhat.com>
To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
Kyle McMartin <kmcmartin at redhat.com>
-Cc: kernel at lists.fedoraproject.org, utrace-devel at redhat.com
-Subject: [PATCH utrace-3.1 32/31] ptrace_report_syscall: check if
- TIF_SYSCALL_EMU is defined
-Message-ID: <20110809173656.GC26443 at redhat.com>
-References: <20110802174514.GA23073 at redhat.com> <20110803190806.GA30619 at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 32/33] ptrace_report_syscall: check if TIF_SYSCALL_EMU is
+ defined
+Message-ID: <20111121200251.GA27906 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
-In-Reply-To: <20110803190806.GA30619 at redhat.com>
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
Status: RO
Content-Length: 839
Lines: 31
@@ -7335,50 +7116,43 @@ index 90ca578..a1bac95 100644
1.5.5.1
-From davej Thu Sep 1 14:14:49 2011
+From oleg at redhat.com Mon Nov 21 15:07:37 2011
Return-Path: oleg at redhat.com
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
- gelk.kernelslacker.org
-X-Spam-Level:
-X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD,
- UNPARSEABLE_RELAY autolearn=ham version=3.3.2
-Received: from mail.corp.redhat.com [10.5.5.52]
- by gelk with IMAP (fetchmail-6.3.20)
- for <davej at localhost> (single-drop); Thu, 01 Sep 2011 14:14:49 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
- zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by
- mail04.corp.redhat.com with LMTP; Thu, 1 Sep 2011 14:13:55 -0400 (EDT)
+Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
+ zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
+ zmail13.collab.prod.int.phx2.redhat.com with LMTP; Mon, 21 Nov 2011
+ 15:07:37 -0500 (EST)
Received: from localhost (localhost.localdomain [127.0.0.1])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 1BA199C63F;
- Thu, 1 Sep 2011 14:13:55 -0400 (EDT)
-Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1])
- by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id 0vQx9zlcQB36; Thu, 1 Sep 2011 14:13:55 -0400 (EDT)
-Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
- by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 009959C63D;
- Thu, 1 Sep 2011 14:13:55 -0400 (EDT)
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 33405D8A50;
+ Mon, 21 Nov 2011 15:07:37 -0500 (EST)
+Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
+ by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
+ with ESMTP id 3WH8FhvizjEA; Mon, 21 Nov 2011 15:07:37 -0500 (EST)
+Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
+ by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 1274FD89BB;
+ Mon, 21 Nov 2011 15:07:37 -0500 (EST)
Received: from tranklukator.englab.brq.redhat.com (dhcp-1-232.brq.redhat.com [10.34.1.232])
- by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p81IDrDX015389;
- Thu, 1 Sep 2011 14:13:54 -0400
+ by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id pALK7YHr017898;
+ Mon, 21 Nov 2011 15:07:35 -0500
Received: by tranklukator.englab.brq.redhat.com (nbSMTP-1.00) for uid 500
- oleg at redhat.com; Thu, 1 Sep 2011 20:10:54 +0200 (CEST)
-Date: Thu, 1 Sep 2011 20:10:53 +0200
+ oleg at redhat.com; Mon, 21 Nov 2011 21:02:55 +0100 (CET)
+Date: Mon, 21 Nov 2011 21:02:53 +0100
From: Oleg Nesterov <oleg at redhat.com>
-To: Dave Jones <davej at redhat.com>
-Cc: kernel at lists.fedoraproject.org, cebbert at redhat.com
-Subject: [PATCH F-16] bz735118: utrace: s390: fix the compile problem with
- traps.c
-Message-ID: <20110901181053.GA24990 at redhat.com>
+To: Dave Jones <davej at redhat.com>, "Frank Ch. Eigler" <fche at redhat.com>,
+ Josh Boyer <jwboyer at redhat.com>, Josh Stone <jistone at redhat.com>,
+ Kyle McMartin <kmcmartin at redhat.com>
+Cc: kernel at lists.fedoraproject.org
+Subject: [PATCH 33/33] utrace: s390: fix the compile problem with traps.c
+Message-ID: <20111121200253.GA27913 at redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
+In-Reply-To: <20111121200039.GA27699 at redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
-X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22
Status: RO
-Content-Length: 777
-Lines: 27
-
-https://bugzilla.redhat.com/show_bug.cgi?id=735118
+Content-Length: 725
+Lines: 25
d99e60e5 "tracehooks: reintroduce tracehook_consider_fatal_signal()"
breaks the compilation of arch/s390/kernel/traps.c. Restore the
@@ -7390,7 +7164,7 @@ Signed-off-by: Oleg Nesterov <oleg at redhat.com>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
-index 1018ab6..50e975d 100644
+index f506e1b..3132498 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -18,7 +18,7 @@
More information about the scm-commits
mailing list