Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2013-11-25 14:33:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-source (Old)
and /work/SRC/openSUSE:Factory/.kernel-source.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/kernel-cubox.changes 2013-11-08 08:37:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-cubox.changes 2013-11-25 14:33:26.000000000 +0100
@@ -2 +2 @@
-Wed Nov 6 14:54:28 CET 2013 - mhocko@suse.cz
+Thu Nov 21 00:04:25 CET 2013 - jslaby@suse.cz
@@ -4,3 +4,2 @@
-- Fix a few incorrectly checked [io_]remap_pfn_range() calls
- (bnc#849021, CVE-2013-4511).
-- commit 2607707
+- Linux 3.12.1.
+- commit 1e06fbe
@@ -9 +8 @@
-Wed Oct 30 19:04:18 CET 2013 - dsterba@suse.cz
+Wed Nov 20 14:47:00 CET 2013 - jslaby@suse.cz
@@ -11,3 +10,86 @@
-- Disable patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch
- reference: bnc#848059
-- commit e6d4a27
+- Update config files (fate#315172).
+- commit a0984ed
+
+-------------------------------------------------------------------
+Wed Nov 20 13:15:58 CET 2013 - jslaby@suse.cz
+
+- x86/dumpstack: Fix printk_address for direct addresses
+ (bnc#845621).
+- Refresh patches.suse/stack-unwind.
+- Refresh patches.xen/xen-x86_64-dump-user-pgt.
+- commit ce55b22
+
+-------------------------------------------------------------------
+Tue Nov 19 16:52:03 CET 2013 - jbohac@suse.cz
+
+- supported.conf: marked net/netfilter/xt_set as supported (bnc#851066)
+ xt_set should have been enabled together with the ip_set modules in
+ fate#313309
+- commit c2e046e
+
+-------------------------------------------------------------------
+Tue Nov 12 14:09:24 CET 2013 - jdelvare@suse.de
+
+- armv6hl, armv7hl: Update config files.
+ Set CONFIG_BATMAN_ADV_BLA=y as all other kernel configuration files
+ have.
+- commit e7c00d8
+
+-------------------------------------------------------------------
+Fri Nov 8 17:27:48 CET 2013 - jdelvare@suse.de
+
+- Update config files:
+ * CONFIG_BATMAN_ADV_NC=y, because other BATMAN_ADV options are all
+ enabled so why not this one.
+ * CONFIG_GPIO_SCH=m, CONFIG_GPIO_PCH=m, because we support all other
+ features of these pieces of hardware.
+ * CONFIG_INTEL_POWERCLAMP=m, because this small driver might be
+ useful in specific cases, and there's no obvious reason not to
+ include it.
+- commit 79e7a03
+
+-------------------------------------------------------------------
+Thu Nov 7 14:39:46 CET 2013 - jbeulich@suse.com
+
+- Update Xen patches to 3.12-final.
+- commit ec28986
+
+-------------------------------------------------------------------
+Wed Nov 6 17:58:38 CET 2013 - duwe@suse.de
+
+- fate#316581: CONFIG_IBM_BSR y -> m
+- commit f5eba64
+
+-------------------------------------------------------------------
+Mon Nov 4 13:54:39 CET 2013 - jslaby@suse.cz
+
+- Delete patches.kernel.org/patch-3.11.1.
+- commit ec24572
+
+-------------------------------------------------------------------
+Mon Nov 4 03:19:40 CET 2013 - jeffm@suse.com
+
+- Update config files.
+- commit f7c27a2
+
+-------------------------------------------------------------------
+Mon Nov 4 02:20:43 CET 2013 - jeffm@suse.com
+
+- Update to 3.12-final.
+- commit bd2bcf1
+
+-------------------------------------------------------------------
+Mon Nov 4 02:19:32 CET 2013 - jeffm@suse.com
+
+- Refresh
+ patches.suse/btrfs-add-ability-to-query-change-feature-bits-online-ioctl.
+- commit a58c8c5
+
+-------------------------------------------------------------------
+Mon Nov 4 02:16:56 CET 2013 - jeffm@suse.com
+
+- Refresh patches.suse/btrfs-add-tracing-for-failed-reservations.
+- Refresh patches.suse/btrfs-publish-allocation-data-in-sysfs.
+ - No code change: missing 'quilt add' caused a chunk to be
+ in the wrong patch.
+- commit 0346b5c
@@ -20 +102 @@
-- commit 5b1b1d3
+- commit 5fe5110
@@ -26 +108 @@
-- commit 8bd2042
+- commit c8ca4fb
@@ -29 +111 @@
-Mon Oct 28 10:31:59 CET 2013 - jbeulich@suse.com
+Tue Oct 29 14:04:37 CET 2013 - jbeulich@suse.com
@@ -31,2 +113,2 @@
-- Update EC2 config files.
-- commit 81dd01f
+- Update Xen patches to 3.12-rc7 and c/s 1240.
+- commit 49141ff
@@ -35 +117 @@
-Mon Oct 28 09:25:43 CET 2013 - jbeulich@suse.com
+Mon Oct 28 15:04:30 CET 2013 - jeffm@suse.de
@@ -37,5 +119,2 @@
-- Refresh Xen patches (bnc#829682, bnc#842063).
-- pcifront: Deal with toolstack missing 'XenbusStateClosing'
- state.
-- Update Xen patches to 3.11.6.
-- commit 2339477
+- Update to 3.12-rc7.
+- commit c59f68d
@@ -44 +123 @@
-Thu Oct 24 18:23:02 CEST 2013 - trenn@suse.de
+Tue Oct 22 21:20:23 CEST 2013 - jeffm@suse.com
@@ -46,3 +125,2 @@
-- cpufreq: ondemand: Change the calculation of target frequency
- (bnc#846734).
-- commit 0ba01b7
+- nouveau: Fix race with fence signaling (bnc#844177).
+- commit db1113e
@@ -51 +129 @@
-Thu Oct 24 17:08:03 CEST 2013 - dsterba@suse.cz
+Tue Oct 22 21:19:59 CEST 2013 - jeffm@suse.com
@@ -53,2 +131,22 @@
-- Btrfs: fix negative qgroup tracking from owner accounting (bnc#821948)
-- commit ef319f1
+- btrfs: add ioctl to export size of global metadata reservation.
+- btrfs: add tracing for failed reservations.
+- btrfs: publish allocation data in sysfs.
+- btrfs: publish device membership in sysfs.
+- btrfs: publish fs label in sysfs.
+- btrfs: publish per-super attributes in sysfs.
+- btrfs: publish per-super features in sysfs.
+- btrfs: publish supported featured in sysfs.
+- btrfs: publish unknown feature bits in sysfs.
+- kobject: export kobj_sysfs_ops.
+- Refresh
+ patches.suse/btrfs-add-ability-to-change-features-via-sysfs.
+- Refresh
+ patches.suse/btrfs-use-feature-attributes-to-print-names-in-errors.
+- Delete
+ patches.suse/btrfs-add-per-super-attribute-publishing-to-sysfs.
+- Delete
+ patches.suse/btrfs-add-publishing-of-unknown-features-in-sysfs.
+- Delete patches.suse/btrfs-export-supported-featured-to-sysfs.
+- Delete patches.suse/btrfs-publish-per-super-features-to-sysfs.
+- Delete patches.suse/introduce-kobj_completion.
+- commit 28f62b4
@@ -57 +155 @@
-Tue Oct 22 21:17:47 CEST 2013 - jeffm@suse.com
+Mon Oct 21 22:40:08 CEST 2013 - jeffm@suse.com
@@ -59,2 +157,2 @@
-- nouveau: Fix race with fence signaling (bnc#844177).
-- commit 8d7989b
+- Update to 3.12-rc6.
+- commit 7244867
@@ -63 +161 @@
-Fri Oct 18 22:19:21 CEST 2013 - jslaby@suse.cz
+Wed Oct 16 12:17:14 CEST 2013 - jbeulich@suse.com
@@ -65,3 +163,2 @@
-- Linux 3.11.6 (bnc#841645).
-- Delete patches.drivers/ALSA-hda-Add-fixup-for-ASUS-N56VZ.
-- commit 9ca6827
+- Update x86 Xen config files (RTC_DRV_EFI=y).
+- commit ac42dba
@@ -70 +167 @@
-Mon Oct 14 18:45:32 CEST 2013 - jeffm@suse.com
+Wed Oct 16 11:35:46 CEST 2013 - jbeulich@suse.com
@@ -72,2 +169,5 @@
-- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5 (vanilla)
-- commit 53efb9c
+- Update Xen patches to 3.12-rc5.
+- config.conf: Re-enable Xen configs.
+- Update config files.
+- Delete patches.xen/xen3-010-acpi_initrd_override_tables.patch.
+- commit 8673f3f
@@ -76 +176 @@
-Mon Oct 14 18:21:41 CEST 2013 - jeffm@suse.com
+Tue Oct 15 15:26:01 CEST 2013 - oneukum@suse.de
@@ -78,2 +178,2 @@
-- config: enable HAVE_BOOTMEM_INFO_NODE on ppc64 to match 3.11.5
-- commit 22f9877
++++ 347 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kernel-source/kernel-cubox.changes
++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-cubox.changes
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-exynos.changes: same change
kernel-lpae.changes: same change
kernel-pae.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-trace.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
Old:
----
linux-3.11.tar.bz2
New:
----
linux-3.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-cubox.spec ++++++
--- /var/tmp/diff_new_pack.jVxcGA/_old 2013-11-25 14:33:38.000000000 +0100
+++ /var/tmp/diff_new_pack.jVxcGA/_new 2013-11-25 14:33:38.000000000 +0100
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.11
-%define patchversion 3.11.6
+%define srcversion 3.12
+%define patchversion 3.12.1
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Name: kernel-cubox
Summary: Kernel for SolidRun Cubox
-Version: 3.11.6
+Version: 3.12.1
%if 0%{?is_kotd}
-Release: <RELEASE>.g2607707
+Release: <RELEASE>.g1e06fbe
%else
Release: 0
%endif
kernel-debug.spec: same change
kernel-default.spec: same change
kernel-desktop.spec: same change
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.jVxcGA/_old 2013-11-25 14:33:38.000000000 +0100
+++ /var/tmp/diff_new_pack.jVxcGA/_new 2013-11-25 14:33:38.000000000 +0100
@@ -17,16 +17,16 @@
# norootforbuild
-%define patchversion 3.11.6
+%define patchversion 3.12.1
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
Name: kernel-docs
Summary: Kernel Documentation
-Version: 3.11.6
+Version: 3.12.1
%if 0%{?is_kotd}
-Release: <RELEASE>.g2607707
+Release: <RELEASE>.g1e06fbe
%else
Release: 0
%endif
++++++ kernel-ec2.spec ++++++
--- /var/tmp/diff_new_pack.jVxcGA/_old 2013-11-25 14:33:38.000000000 +0100
+++ /var/tmp/diff_new_pack.jVxcGA/_new 2013-11-25 14:33:38.000000000 +0100
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.11
-%define patchversion 3.11.6
+%define srcversion 3.12
+%define patchversion 3.12.1
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
-Version: 3.11.6
+Version: 3.12.1
%if 0%{?is_kotd}
-Release: <RELEASE>.g2607707
+Release: <RELEASE>.g1e06fbe
%else
Release: 0
%endif
kernel-exynos.spec: same change
kernel-lpae.spec: same change
kernel-pae.spec: same change
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.jVxcGA/_old 2013-11-25 14:33:38.000000000 +0100
+++ /var/tmp/diff_new_pack.jVxcGA/_new 2013-11-25 14:33:38.000000000 +0100
@@ -18,8 +18,8 @@
# norootforbuild
# icecream 0
-%define srcversion 3.11
-%define patchversion 3.11.6
+%define srcversion 3.12
+%define patchversion 3.12.1
%define variant %{nil}
%define vanilla_only 0
@@ -29,9 +29,9 @@
Name: kernel-source
Summary: The Linux Kernel Sources
-Version: 3.11.6
+Version: 3.12.1
%if 0%{?is_kotd}
-Release: <RELEASE>.g2607707
+Release: <RELEASE>.g1e06fbe
%else
Release: 0
%endif
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.jVxcGA/_old 2013-11-25 14:33:38.000000000 +0100
+++ /var/tmp/diff_new_pack.jVxcGA/_new 2013-11-25 14:33:38.000000000 +0100
@@ -23,10 +23,10 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
-Version: 3.11.6
+Version: 3.12.1
%if %using_buildservice
%if 0%{?is_kotd}
-Release: <RELEASE>.g2607707
+Release: <RELEASE>.g1e06fbe
%else
Release: 0
%endif
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.jVxcGA/_old 2013-11-25 14:33:38.000000000 +0100
+++ /var/tmp/diff_new_pack.jVxcGA/_new 2013-11-25 14:33:38.000000000 +0100
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.11
-%define patchversion 3.11.6
+%define srcversion 3.12
+%define patchversion 3.12.1
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Name: kernel-trace
Summary: The Standard Kernel with Tracing Features
-Version: 3.11.6
+Version: 3.12.1
%if 0%{?is_kotd}
-Release: <RELEASE>.g2607707
+Release: <RELEASE>.g1e06fbe
%else
Release: 0
%endif
kernel-vanilla.spec: same change
kernel-xen.spec: same change
++++++ config-options.changes.txt ++++++
--- /var/tmp/diff_new_pack.jVxcGA/_old 2013-11-25 14:33:38.000000000 +0100
+++ /var/tmp/diff_new_pack.jVxcGA/_new 2013-11-25 14:33:38.000000000 +0100
@@ -1,4 +1,52 @@
-------------------------------------------------------------------
+Mon Sep 30 14:34:41 UTC 2013 - mmarek@suse.cz
+
+- Do not build udlfb, to avoid conflict with udl (fate#316407)
+ CONFIG_FB_UDL=n
+
+-------------------------------------------------------------------
+Mon Sep 30 12:39:40 UTC 2013 - mmarek@suse.cz
+
+- Disable fb drivers that have been blacklisted via
+ /etc/modprobe.d/50-blacklist.conf for a long time:
+ CONFIG_FB_ATY=n
+ CONFIG_FB_ATY128=n
+ CONFIG_FB_CYBER2000=n
+ CONFIG_FB_MATROX=n (and dependent options)
+ CONFIG_FB_HGA=n
+ CONFIG_FB_I810=n
+ CONFIG_MDA_CONSOLE=n
+ CONFIG_FB_NEOMAGIC=n
+ CONFIG_FB_PM2=n
+ CONFIG_FB_PM3=n
+ CONFIG_FB_RADEON=n
+ CONFIG_FB_RIVA=n
+ CONFIG_FB_SIS=n
+ CONFIG_FB_VOODOO1=n
+ CONFIG_FB_3DFX=n
+ CONFIG_FB_TRIDENT=n
+ CONFIG_FB_VGA16=n
+ CONFIG_FB_KYRO=n
+ CONFIG_FB_ARC=n
+ CONFIG_FB_CIRRUS=n
+ CONFIG_FB_GEODE_LX=n
+ CONFIG_FB_GEODE_GX=n
+ CONFIG_FB_GEODE_GX1=n
+ CONFIG_FB_NVIDIA=n
+ CONFIG_FB_S1D13XXX=n
+ CONFIG_FB_SAVAGE=n
+ CONFIG_FB_ARK=n
+ CONFIG_FB_CARMINE=n
+ CONFIG_FB_N411=n
+ CONFIG_FB_HECUBA=n
+ CONFIG_FB_S3=n
+ CONFIG_FB_SM501=n
+ CONFIG_FB_VIA=n
+ CONFIG_CONFIG_FB_LE80578=n
+ CONFIG_FB_VT8623=n
+
+
+-------------------------------------------------------------------
Fri Sep 27 10:26:33 CEST 2013 - jdelvare@suse.de
- */debug: enable fscache debugging.
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.jVxcGA/_old 2013-11-25 14:33:38.000000000 +0100
+++ /var/tmp/diff_new_pack.jVxcGA/_new 2013-11-25 14:33:38.000000000 +0100
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=3.11
+SRCVERSION=3.12
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against
++++++ config.tar.bz2 ++++++
++++ 28320 lines of diff (skipped)
++++++ linux-3.11.tar.bz2 -> linux-3.12.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/kernel-source/linux-3.11.tar.bz2 /work/SRC/openSUSE:Factory/.kernel-source.new/linux-3.12.tar.bz2 differ: char 11, line 1
++++++ patches.apparmor.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-compatibility-patch-for-v5-network-control new/patches.apparmor/apparmor-compatibility-patch-for-v5-network-control
--- old/patches.apparmor/apparmor-compatibility-patch-for-v5-network-control 2013-07-23 01:54:52.000000000 +0200
+++ new/patches.apparmor/apparmor-compatibility-patch-for-v5-network-control 2013-09-24 15:55:10.000000000 +0200
@@ -21,23 +21,24 @@
create mode 100644 security/apparmor/include/net.h
create mode 100644 security/apparmor/net.c
---- a/security/apparmor/Makefile
-+++ b/security/apparmor/Makefile
-@@ -4,9 +4,9 @@ obj-$(CONFIG_SECURITY_APPARMOR) += appar
+--- a/security/apparmor/Makefile 2013-09-17 11:00:31.021703815 -0400
++++ b/security/apparmor/Makefile 2013-09-17 11:00:42.645510072 -0400
+@@ -4,10 +4,10 @@ obj-$(CONFIG_SECURITY_APPARMOR) += appar
apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \
path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \
- resource.o sid.o file.o
+ resource.o sid.o file.o net.o
+ apparmor-$(CONFIG_SECURITY_APPARMOR_HASH) += crypto.o
-clean-files := capability_names.h rlim_names.h
+clean-files := capability_names.h rlim_names.h af_names.h
# Build a lower case string table of capability names
-@@ -20,6 +20,9 @@ cmd_make-caps = echo "static const char
- -e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/[\2] = "\L\1",/p';\
- echo "};" >> $@
+@@ -25,6 +25,9 @@ cmd_make-caps = echo "static const char
+ -e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/\L\1/p' | \
+ tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
+quiet_cmd_make-af = GEN $@
+cmd_make-af = echo "static const char *address_family_names[] = {" > $@ ; sed -n -e "/AF_MAX/d" -e "/AF_LOCAL/d" -e "s/^\#define[ \\t]\\+AF_\\([A-Z0-9_]\\+\\)[ \\t]\\+\\([0-9]\\+\\)\\(.*\\)\$$/[\\2] = \"\\1\",/p" $< | tr A-Z a-z >> $@ ; echo "};" >> $@
@@ -45,7 +46,7 @@
# Build a lower case string table of rlimit names.
# Transforms lines from
-@@ -56,6 +59,7 @@ cmd_make-rlim = echo "static const char
+@@ -61,6 +64,7 @@ cmd_make-rlim = echo "static const char
tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
$(obj)/capability.o : $(obj)/capability_names.h
@@ -53,34 +54,34 @@
$(obj)/resource.o : $(obj)/rlim_names.h
$(obj)/capability_names.h : $(srctree)/include/uapi/linux/capability.h \
$(src)/Makefile
-@@ -63,3 +67,5 @@ $(obj)/capability_names.h : $(srctree)/i
+@@ -68,3 +72,5 @@ $(obj)/capability_names.h : $(srctree)/i
$(obj)/rlim_names.h : $(srctree)/include/uapi/asm-generic/resource.h \
$(src)/Makefile
$(call cmd,make-rlim)
+$(obj)/af_names.h : $(srctree)/include/linux/socket.h
+ $(call cmd,make-af)
---- a/security/apparmor/apparmorfs.c
-+++ b/security/apparmor/apparmorfs.c
-@@ -203,6 +203,7 @@ static struct aa_fs_entry aa_fs_entry_fe
- AA_FS_DIR("file", aa_fs_entry_file),
+--- a/security/apparmor/apparmorfs.c 2013-09-17 11:00:31.021703815 -0400
++++ b/security/apparmor/apparmorfs.c 2013-09-17 11:00:42.645510072 -0400
+@@ -811,6 +811,7 @@ static struct aa_fs_entry aa_fs_entry_fe
AA_FS_FILE_U64("capability", VFS_CAP_FLAGS_MASK),
AA_FS_DIR("rlimit", aa_fs_entry_rlimit),
+ AA_FS_DIR("caps", aa_fs_entry_caps),
+ AA_FS_FILE_BOOLEAN("network", 1),
{ }
};
-@@ -211,6 +212,8 @@ static struct aa_fs_entry aa_fs_entry_ap
- AA_FS_FILE_FOPS(".replace", 0640, &aa_fs_profile_replace),
+@@ -820,6 +821,8 @@ static struct aa_fs_entry aa_fs_entry_ap
AA_FS_FILE_FOPS(".remove", 0640, &aa_fs_profile_remove),
+ AA_FS_FILE_FOPS("profiles", 0640, &aa_fs_profiles_fops),
AA_FS_DIR("features", aa_fs_entry_features),
+ AA_FS_FILE_STRING("matching", "pattern=aadfa audit perms=crwxamlk/ "
+ "user::other"),
{ }
};
---- a/security/apparmor/include/audit.h
-+++ b/security/apparmor/include/audit.h
-@@ -127,6 +127,10 @@ struct apparmor_audit_data {
+--- a/security/apparmor/include/audit.h 2013-09-17 11:00:31.025703750 -0400
++++ b/security/apparmor/include/audit.h 2013-09-17 11:00:42.645510072 -0400
+@@ -126,6 +126,10 @@ struct apparmor_audit_data {
u32 denied;
kuid_t ouid;
} fs;
@@ -91,8 +92,8 @@
};
};
---- /dev/null
-+++ b/security/apparmor/include/net.h
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ b/security/apparmor/include/net.h 2013-09-17 11:00:42.645510072 -0400
@@ -0,0 +1,40 @@
+/*
+ * AppArmor security module
@@ -134,8 +135,8 @@
+}
+
+#endif /* __AA_NET_H */
---- a/security/apparmor/include/policy.h
-+++ b/security/apparmor/include/policy.h
+--- a/security/apparmor/include/policy.h 2013-09-17 11:00:31.025703750 -0400
++++ b/security/apparmor/include/policy.h 2013-09-17 11:00:42.645510072 -0400
@@ -27,6 +27,7 @@
#include "capability.h"
#include "domain.h"
@@ -143,25 +144,25 @@
+#include "net.h"
#include "resource.h"
- extern const char *const profile_mode_names[];
-@@ -157,6 +158,7 @@ struct aa_policydb {
+ extern const char *const aa_profile_mode_names[];
+@@ -176,6 +177,7 @@ struct aa_replacedby {
* @policy: general match rules governing policy
* @file: The set of rules governing basic file access and domain transitions
* @caps: capabilities for the profile
+ * @net: network controls for the profile
* @rlimits: rlimits for the profile
*
- * The AppArmor profile contains the basic confinement data. Each profile
-@@ -194,6 +196,7 @@ struct aa_profile {
+ * @dents: dentries for the profiles file entries in apparmorfs
+@@ -217,6 +219,7 @@ struct aa_profile {
struct aa_policydb policy;
struct aa_file_rules file;
struct aa_caps caps;
+ struct aa_net net;
struct aa_rlimit rlimits;
- };
---- a/security/apparmor/lsm.c
-+++ b/security/apparmor/lsm.c
+ unsigned char *hash;
+--- a/security/apparmor/lsm.c 2013-09-17 11:00:31.025703750 -0400
++++ b/security/apparmor/lsm.c 2013-09-17 11:00:42.645510072 -0400
@@ -32,6 +32,7 @@
#include "include/context.h"
#include "include/file.h"
@@ -170,7 +171,7 @@
#include "include/path.h"
#include "include/policy.h"
#include "include/procattr.h"
-@@ -614,6 +615,104 @@ static int apparmor_task_setrlimit(struc
+@@ -615,6 +616,104 @@ static int apparmor_task_setrlimit(struc
return error;
}
@@ -275,7 +276,7 @@
static struct security_operations apparmor_ops = {
.name = "apparmor",
-@@ -646,6 +745,19 @@ static struct security_operations apparm
+@@ -647,6 +746,19 @@ static struct security_operations apparm
.getprocattr = apparmor_getprocattr,
.setprocattr = apparmor_setprocattr,
@@ -295,8 +296,8 @@
.cred_alloc_blank = apparmor_cred_alloc_blank,
.cred_free = apparmor_cred_free,
.cred_prepare = apparmor_cred_prepare,
---- /dev/null
-+++ b/security/apparmor/net.c
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ b/security/apparmor/net.c 2013-09-17 11:00:42.649510003 -0400
@@ -0,0 +1,184 @@
+/*
+ * AppArmor security module
@@ -482,18 +483,18 @@
+
+ return error;
+}
---- a/security/apparmor/policy.c
-+++ b/security/apparmor/policy.c
-@@ -745,6 +745,7 @@ static void free_profile(struct aa_profi
+--- a/security/apparmor/policy.c 2013-09-17 11:00:31.029703685 -0400
++++ b/security/apparmor/policy.c 2013-09-17 11:00:42.649510003 -0400
+@@ -602,6 +602,7 @@ void aa_free_profile(struct aa_profile *
aa_free_file_rules(&profile->file);
aa_free_cap_rules(&profile->caps);
+ aa_free_net_rules(&profile->net);
aa_free_rlimit_rules(&profile->rlimits);
- aa_put_dfa(profile->xmatch);
---- a/security/apparmor/policy_unpack.c
-+++ b/security/apparmor/policy_unpack.c
+ kzfree(profile->dirname);
+--- a/security/apparmor/policy_unpack.c 2013-09-17 11:00:31.029703685 -0400
++++ b/security/apparmor/policy_unpack.c 2013-09-17 11:00:42.649510003 -0400
@@ -193,6 +193,19 @@ fail:
return 0;
}
@@ -514,7 +515,7 @@
static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name)
{
if (unpack_nameX(e, AA_U32, name)) {
-@@ -471,6 +484,7 @@ static struct aa_profile *unpack_profile
+@@ -476,6 +489,7 @@ static struct aa_profile *unpack_profile
{
struct aa_profile *profile = NULL;
const char *name = NULL;
@@ -522,7 +523,7 @@
int i, error = -EPROTO;
kernel_cap_t tmpcap;
u32 tmp;
-@@ -564,6 +578,38 @@ static struct aa_profile *unpack_profile
+@@ -576,6 +590,38 @@ static struct aa_profile *unpack_profile
if (!unpack_rlimits(e, profile))
goto fail;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-profiles-seq_file new/patches.apparmor/apparmor-profiles-seq_file
--- old/patches.apparmor/apparmor-profiles-seq_file 2013-07-23 01:54:52.000000000 +0200
+++ new/patches.apparmor/apparmor-profiles-seq_file 1970-01-01 01:00:00.000000000 +0100
@@ -1,255 +0,0 @@
-From: Jeff Mahoney
-Subject: apparmor: Add "profiles" list to sysfs
-Patch-mainline: Needs review
-
- In order to shut apparmor back down, we need to get a list of loaded
- profiles. This patch re-adds the profiles list.
-
-Signed-off-by: Jeff Mahoney
----
- security/apparmor/apparmorfs.c | 227 +++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 227 insertions(+)
-
---- a/security/apparmor/apparmorfs.c
-+++ b/security/apparmor/apparmorfs.c
-@@ -144,6 +144,232 @@ static const struct file_operations aa_f
- .llseek = default_llseek,
- };
-
-+/**
-+ * __next_namespace - find the next namespace to list
-+ * @root: root namespace to stop search at (NOT NULL)
-+ * @ns: current ns position (NOT NULL)
-+ *
-+ * Find the next namespace from @ns under @root and handle all locking needed
-+ * while switching current namespace.
-+ *
-+ * Returns: next namespace or NULL if at last namespace under @root
-+ * NOTE: will not unlock root->lock
-+ */
-+static struct aa_namespace *__next_namespace(struct aa_namespace *root,
-+ struct aa_namespace *ns)
-+{
-+ struct aa_namespace *parent;
-+
-+ /* is next namespace a child */
-+ if (!list_empty(&ns->sub_ns)) {
-+ struct aa_namespace *next;
-+ next = list_first_entry(&ns->sub_ns, typeof(*ns), base.list);
-+ read_lock(&next->lock);
-+ return next;
-+ }
-+
-+ /* check if the next ns is a sibling, parent, gp, .. */
-+ parent = ns->parent;
-+ while (parent) {
-+ read_unlock(&ns->lock);
-+ list_for_each_entry_continue(ns, &parent->sub_ns, base.list) {
-+ read_lock(&ns->lock);
-+ return ns;
-+ }
-+ if (parent == root)
-+ return NULL;
-+ ns = parent;
-+ parent = parent->parent;
-+ }
-+
-+ return NULL;
-+}
-+
-+/**
-+ * __first_profile - find the first profile in a namespace
-+ * @root: namespace that is root of profiles being displayed (NOT NULL)
-+ * @ns: namespace to start in (NOT NULL)
-+ *
-+ * Returns: unrefcounted profile or NULL if no profile
-+ */
-+static struct aa_profile *__first_profile(struct aa_namespace *root,
-+ struct aa_namespace *ns)
-+{
-+ for ( ; ns; ns = __next_namespace(root, ns)) {
-+ if (!list_empty(&ns->base.profiles))
-+ return list_first_entry(&ns->base.profiles,
-+ struct aa_profile, base.list);
-+ }
-+ return NULL;
-+}
-+
-+/**
-+ * __next_profile - step to the next profile in a profile tree
-+ * @profile: current profile in tree (NOT NULL)
-+ *
-+ * Perform a depth first taversal on the profile tree in a namespace
-+ *
-+ * Returns: next profile or NULL if done
-+ * Requires: profile->ns.lock to be held
-+ */
-+static struct aa_profile *__next_profile(struct aa_profile *p)
-+{
-+ struct aa_profile *parent;
-+ struct aa_namespace *ns = p->ns;
-+
-+ /* is next profile a child */
-+ if (!list_empty(&p->base.profiles))
-+ return list_first_entry(&p->base.profiles, typeof(*p),
-+ base.list);
-+
-+ /* is next profile a sibling, parent sibling, gp, subling, .. */
-+ parent = p->parent;
-+ while (parent) {
-+ list_for_each_entry_continue(p, &parent->base.profiles,
-+ base.list)
-+ return p;
-+ p = parent;
-+ parent = parent->parent;
-+ }
-+
-+ /* is next another profile in the namespace */
-+ list_for_each_entry_continue(p, &ns->base.profiles, base.list)
-+ return p;
-+
-+ return NULL;
-+}
-+
-+/**
-+ * next_profile - step to the next profile in where ever it may be
-+ * @root: root namespace (NOT NULL)
-+ * @profile: current profile (NOT NULL)
-+ *
-+ * Returns: next profile or NULL if there isn't one
-+ */
-+static struct aa_profile *next_profile(struct aa_namespace *root,
-+ struct aa_profile *profile)
-+{
-+ struct aa_profile *next = __next_profile(profile);
-+ if (next)
-+ return next;
-+
-+ /* finished all profiles in namespace move to next namespace */
-+ return __first_profile(root, __next_namespace(root, profile->ns));
-+}
-+
-+/**
-+ * p_start - start a depth first traversal of profile tree
-+ * @f: seq_file to fill
-+ * @pos: current position
-+ *
-+ * Returns: first profile under current namespace or NULL if none found
-+ *
-+ * acquires first ns->lock
-+ */
-+static void *p_start(struct seq_file *f, loff_t *pos)
-+ __acquires(root->lock)
-+{
-+ struct aa_profile *profile = NULL;
-+ struct aa_namespace *root = aa_current_profile()->ns;
-+ loff_t l = *pos;
-+ f->private = aa_get_namespace(root);
-+
-+
-+ /* find the first profile */
-+ read_lock(&root->lock);
-+ profile = __first_profile(root, root);
-+
-+ /* skip to position */
-+ for (; profile && l > 0; l--)
-+ profile = next_profile(root, profile);
-+
-+ return profile;
-+}
-+
-+/**
-+ * p_next - read the next profile entry
-+ * @f: seq_file to fill
-+ * @p: profile previously returned
-+ * @pos: current position
-+ *
-+ * Returns: next profile after @p or NULL if none
-+ *
-+ * may acquire/release locks in namespace tree as necessary
-+ */
-+static void *p_next(struct seq_file *f, void *p, loff_t *pos)
-+{
-+ struct aa_profile *profile = p;
-+ struct aa_namespace *root = f->private;
-+ (*pos)++;
-+
-+ return next_profile(root, profile);
-+}
-+
-+/**
-+ * p_stop - stop depth first traversal
-+ * @f: seq_file we are filling
-+ * @p: the last profile writen
-+ *
-+ * Release all locking done by p_start/p_next on namespace tree
-+ */
-+static void p_stop(struct seq_file *f, void *p)
-+ __releases(root->lock)
-+{
-+ struct aa_profile *profile = p;
-+ struct aa_namespace *root = f->private, *ns;
-+
-+ if (profile) {
-+ for (ns = profile->ns; ns && ns != root; ns = ns->parent)
-+ read_unlock(&ns->lock);
-+ }
-+ read_unlock(&root->lock);
-+ aa_put_namespace(root);
-+}
-+
-+/**
-+ * seq_show_profile - show a profile entry
-+ * @f: seq_file to file
-+ * @p: current position (profile) (NOT NULL)
-+ *
-+ * Returns: error on failure
-+ */
-+static int seq_show_profile(struct seq_file *f, void *p)
-+{
-+ struct aa_profile *profile = (struct aa_profile *)p;
-+ struct aa_namespace *root = f->private;
-+
-+ if (profile->ns != root)
-+ seq_printf(f, ":%s://", aa_ns_name(root, profile->ns));
-+ seq_printf(f, "%s (%s)\n", profile->base.hname,
-+ COMPLAIN_MODE(profile) ? "complain" : "enforce");
-+
-+ return 0;
-+}
-+
-+static const struct seq_operations aa_fs_profiles_op = {
-+ .start = p_start,
-+ .next = p_next,
-+ .stop = p_stop,
-+ .show = seq_show_profile,
-+};
-+
-+static int profiles_open(struct inode *inode, struct file *file)
-+{
-+ return seq_open(file, &aa_fs_profiles_op);
-+}
-+
-+static int profiles_release(struct inode *inode, struct file *file)
-+{
-+ return seq_release(inode, file);
-+}
-+
-+static const struct file_operations aa_fs_profiles_fops = {
-+ .open = profiles_open,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = profiles_release,
-+};
-+
- static int aa_fs_seq_show(struct seq_file *seq, void *v)
- {
- struct aa_fs_entry *fs_file = seq->private;
-@@ -214,6 +440,7 @@ static struct aa_fs_entry aa_fs_entry_ap
- AA_FS_DIR("features", aa_fs_entry_features),
- AA_FS_FILE_STRING("matching", "pattern=aadfa audit perms=crwxamlk/ "
- "user::other"),
-+ AA_FS_FILE_FOPS("profiles", 0440, &aa_fs_profiles_fops),
- { }
- };
-
++++++ patches.arch.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/010-acpi_initrd_override_tables.patch new/patches.arch/010-acpi_initrd_override_tables.patch
--- old/patches.arch/010-acpi_initrd_override_tables.patch 2013-08-05 04:24:06.000000000 +0200
+++ new/patches.arch/010-acpi_initrd_override_tables.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,75 +0,0 @@
-From: Thomas Renninger
-Subject: ACPI: Cleanup acpi_initrd_override declaration and remove ifdefs
-References: none
-Patch-Mainline: Submitted
-
-Move the acpi_initrd_override() declaration out of CONFIG_ACPI area so that
-acpi_initrd_override is also defined if CONFIG_ACPI is not defined.
-
-Move the acpi_initrd_override() call into reserve_initrd() inside the
-CONFIG_BLK_DEV_INITRD block.
-
-Now ifdefs around the call in setup.c can be removed.
-
-Cleanup only, no functional change.
-
-Signed-off-by: Thomas Renninger
----
- arch/x86/kernel/setup.c | 6 ++----
- include/linux/acpi.h | 16 ++++++++--------
- 2 files changed, 10 insertions(+), 12 deletions(-)
-
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -407,6 +407,8 @@ static void __init reserve_initrd(void)
- relocate_initrd();
-
- memblock_free(ramdisk_image, ramdisk_end - ramdisk_image);
-+
-+ acpi_initrd_override((void *)initrd_start, initrd_end - initrd_start);
- }
- #else
- static void __init early_reserve_initrd(void)
-@@ -952,10 +954,6 @@ void __init setup_arch(char **cmdline_p)
-
- reserve_initrd();
-
--#if defined(CONFIG_ACPI) && defined(CONFIG_BLK_DEV_INITRD)
-- acpi_initrd_override((void *)initrd_start, initrd_end - initrd_start);
--#endif
--
- reserve_crashkernel();
-
- vsmp_init();
---- a/include/linux/acpi.h
-+++ b/include/linux/acpi.h
-@@ -78,14 +78,6 @@ typedef int (*acpi_table_handler) (struc
- typedef int (*acpi_tbl_entry_handler)(struct acpi_subtable_header *header,
- const unsigned long end);
-
--#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
--void acpi_initrd_override(void *data, size_t size);
--#else
--static inline void acpi_initrd_override(void *data, size_t size)
--{
--}
--#endif
--
- char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
- void __acpi_unmap_table(char *map, unsigned long size);
- int early_acpi_boot_init(void);
-@@ -499,6 +491,14 @@ static inline void arch_reserve_mem_area
- #define acpi_os_set_prepare_sleep(func, pm1a_ctrl, pm1b_ctrl) do { } while (0)
- #endif
-
-+#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
-+void acpi_initrd_override(void *data, size_t size);
-+#else
-+static inline void acpi_initrd_override(void *data, size_t size)
-+{
-+}
-+#endif
-+
- #if defined(CONFIG_ACPI) && defined(CONFIG_PM_RUNTIME)
- int acpi_dev_runtime_suspend(struct device *dev);
- int acpi_dev_runtime_resume(struct device *dev);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch new/patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch
--- old/patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch 2013-08-05 04:24:06.000000000 +0200
+++ new/patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch 2013-09-25 16:09:40.000000000 +0200
@@ -24,13 +24,13 @@
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -45,6 +45,7 @@
- #include
+ #include
#include "musb_core.h"
+#include "../../../arch/arm/mach-omap2/usb.h"
- #ifdef CONFIG_OF
static const struct of_device_id musb_dsps_of_match[];
+
diff --git a/include/linux/platform_data/usb-omap.h b/include/linux/platform_data/usb-omap.h
index ef65b67..0da5930 100644
--- a/include/linux/platform_data/usb-omap.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-arndale-dma.patch new/patches.arch/arm-arndale-dma.patch
--- old/patches.arch/arm-arndale-dma.patch 2013-08-05 04:24:06.000000000 +0200
+++ new/patches.arch/arm-arndale-dma.patch 2013-09-25 16:09:40.000000000 +0200
@@ -14,10 +14,10 @@
arch/arm/mach-exynos/mach-exynos5-dt.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
-diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
-index 753b94f..6e893f5 100644
---- a/arch/arm/mach-exynos/mach-exynos5-dt.c
-+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
+Index: linux-3.12-rc2-master/arch/arm/mach-exynos/mach-exynos5-dt.c
+===================================================================
+--- linux-3.12-rc2-master.orig/arch/arm/mach-exynos/mach-exynos5-dt.c
++++ linux-3.12-rc2-master/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -14,6 +14,7 @@
#include
#include
@@ -26,17 +26,12 @@
#include
#include
-@@ -23,11 +24,31 @@
+@@ -23,6 +24,26 @@
#include "common.h"
+static u64 dma_mask64 = DMA_BIT_MASK(64);
+
- static void __init exynos5_dt_map_io(void)
- {
- exynos_init_io(NULL, 0);
- }
-
+static int exynos5250_platform_notifier(struct notifier_block *nb,
+ unsigned long event, void *__dev)
+{
@@ -58,7 +53,7 @@
static void __init exynos5_dt_machine_init(void)
{
struct device_node *i2c_np;
-@@ -52,6 +73,9 @@ static void __init exynos5_dt_machine_init(void)
+@@ -47,6 +68,9 @@ static void __init exynos5_dt_machine_in
}
}
@@ -68,6 +63,3 @@
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
---
-1.7.10.4
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-arndale-usb.patch new/patches.arch/arm-arndale-usb.patch
--- old/patches.arch/arm-arndale-usb.patch 2013-08-05 04:24:06.000000000 +0200
+++ new/patches.arch/arm-arndale-usb.patch 2013-09-25 16:09:40.000000000 +0200
@@ -63,7 +63,7 @@
+
static int s5p_ehci_probe(struct platform_device *pdev)
{
- struct s5p_ehci_platdata *pdata = pdev->dev.platform_data;
+ struct s5p_ehci_platdata *pdata = dev_get_platdata(&pdev->dev);
@@ -116,6 +139,8 @@ static int s5p_ehci_probe(struct platform_device *pdev)
skip_phy:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-exynos-nosparse.patch new/patches.arch/arm-exynos-nosparse.patch
--- old/patches.arch/arm-exynos-nosparse.patch 2013-08-05 04:24:06.000000000 +0200
+++ new/patches.arch/arm-exynos-nosparse.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-From: Alexander Graf
-Subject: [PATCH] Disable sparsemem for exynos
-Patch-Mainline: No, this is a test patch
-
-Sparsemem breaks when loading an initrd. Temporarily disable it.
-
-Signed-off-by: Alexander Graf
-
-Index: linux-3.7-rc2-master/arch/arm/Kconfig
-===================================================================
---- linux-3.7-rc2-master.orig/arch/arm/Kconfig
-+++ linux-3.7-rc2-master/arch/arm/Kconfig
-@@ -829,7 +829,6 @@ config ARCH_EXYNOS
- bool "Samsung EXYNOS"
- select ARCH_HAS_CPUFREQ
- select ARCH_HAS_HOLES_MEMORYMODEL
-- select ARCH_SPARSEMEM_ENABLE
- select CLKDEV_LOOKUP
- select COMMON_CLK
- select CPU_V7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-imx-usb.patch new/patches.arch/arm-imx-usb.patch
--- old/patches.arch/arm-imx-usb.patch 2013-08-05 04:24:06.000000000 +0200
+++ new/patches.arch/arm-imx-usb.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-From be9ae98b3da5b8bac98e342b4aee3a141f689f7c Mon Sep 17 00:00:00 2001
-From: Alexander Graf
-Date: Sun, 20 Jan 2013 23:00:39 +0100
-Subject: [PATCH] ARM: fix imx usb driver build issue
-Patch-Mainline: No, too hacky :)
-
-The FSL i.MX USB drivers have issues with the new multiarch patch series.
-Fix them up to access their i.MX headers directly.
-
-This patch is only meant to get things building for now. Please do not apply
-or send upstream!
-
-Signed-off-by: Alexander Graf
-
-diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c
-index 1b0f086..1c06d1f 100644
---- a/drivers/usb/gadget/fsl_mxc_udc.c
-+++ b/drivers/usb/gadget/fsl_mxc_udc.c
-@@ -18,6 +18,8 @@
- #include
- #include
-
-+#include "../../../arch/arm/mach-imx/hardware.h"
-+
- static struct clk *mxc_ahb_clk;
- static struct clk *mxc_per_clk;
- static struct clk *mxc_ipg_clk;
-diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c
-index a0eb857..21d2e0a 100644
---- a/drivers/usb/gadget/imx_udc.c
-+++ b/drivers/usb/gadget/imx_udc.c
-@@ -36,7 +36,7 @@
- #include
-
- #include
--#include
-+#include "../../../arch/arm/mach-imx/hardware.h"
-
- #include "imx_udc.h"
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-xen-0001-arm-introduce-psci_smp_ops.patch new/patches.arch/arm-xen-0001-arm-introduce-psci_smp_ops.patch
--- old/patches.arch/arm-xen-0001-arm-introduce-psci_smp_ops.patch 2013-08-05 04:24:06.000000000 +0200
+++ new/patches.arch/arm-xen-0001-arm-introduce-psci_smp_ops.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,304 +0,0 @@
-From dd00106f8f96f65fe5362041775ebb4c20d8448b Mon Sep 17 00:00:00 2001
-From: Stefano Stabellini
-Date: Tue, 21 May 2013 14:24:11 +0000
-Subject: [PATCH 1/8] arm: introduce psci_smp_ops
-Patch-Mainline: v3.11-rc1
-Git-commit: 05774088391c7430f6a4c1d5d18196ef17bb3ba9
-
-Rename virt_smp_ops to psci_smp_ops and move them to arch/arm/kernel/psci_smp.c.
-Remove mach-virt/platsmp.c, now unused.
-Compile psci_smp if CONFIG_ARM_PSCI and CONFIG_SMP.
-
-Add a cpu_die smp_op based on psci_ops.cpu_off.
-
-Initialize PSCI before setting smp_ops in setup_arch.
-
-If PSCI is available on the platform, prefer psci_smp_ops over the
-platform smp_ops.
-
-Signed-off-by: Stefano Stabellini
-Acked-by: Will Deacon
-CC: arnd@arndb.de
-CC: marc.zyngier@arm.com
-CC: linux@arm.linux.org.uk
-CC: nico@linaro.org
-CC: rob.herring@calxeda.com
-Acked-by: Alexander Graf
----
- arch/arm/include/asm/psci.h | 9 +++++
- arch/arm/kernel/Makefile | 5 ++-
- arch/arm/kernel/psci.c | 7 ++--
- arch/arm/kernel/psci_smp.c | 84 ++++++++++++++++++++++++++++++++++++++++++
- arch/arm/kernel/setup.c | 7 +++-
- arch/arm/mach-virt/Makefile | 1 -
- arch/arm/mach-virt/platsmp.c | 50 -------------------------
- arch/arm/mach-virt/virt.c | 3 --
- 8 files changed, 106 insertions(+), 60 deletions(-)
- create mode 100644 arch/arm/kernel/psci_smp.c
- delete mode 100644 arch/arm/mach-virt/platsmp.c
-
-diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
-index ce0dbe7..c4ae171 100644
---- a/arch/arm/include/asm/psci.h
-+++ b/arch/arm/include/asm/psci.h
-@@ -32,5 +32,14 @@ struct psci_operations {
- };
-
- extern struct psci_operations psci_ops;
-+extern struct smp_operations psci_smp_ops;
-+
-+#ifdef CONFIG_ARM_PSCI
-+void psci_init(void);
-+bool psci_smp_available(void);
-+#else
-+static inline void psci_init(void) { }
-+static inline bool psci_smp_available(void) { return false; }
-+#endif
-
- #endif /* __ASM_ARM_PSCI_H */
-diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
-index 5f3338e..dd9d90a 100644
---- a/arch/arm/kernel/Makefile
-+++ b/arch/arm/kernel/Makefile
-@@ -82,6 +82,9 @@ obj-$(CONFIG_DEBUG_LL) += debug.o
- obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-
- obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o
--obj-$(CONFIG_ARM_PSCI) += psci.o
-+ifeq ($(CONFIG_ARM_PSCI),y)
-+obj-y += psci.o
-+obj-$(CONFIG_SMP) += psci_smp.o
-+endif
-
- extra-y := $(head-y) vmlinux.lds
-diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
-index 3653164..4693188 100644
---- a/arch/arm/kernel/psci.c
-+++ b/arch/arm/kernel/psci.c
-@@ -158,7 +158,7 @@ static const struct of_device_id psci_of_match[] __initconst = {
- {},
- };
-
--static int __init psci_init(void)
-+void __init psci_init(void)
- {
- struct device_node *np;
- const char *method;
-@@ -166,7 +166,7 @@ static int __init psci_init(void)
-
- np = of_find_matching_node(NULL, psci_of_match);
- if (!np)
-- return 0;
-+ return;
-
- pr_info("probing function IDs from device-tree\n");
-
-@@ -206,6 +206,5 @@ static int __init psci_init(void)
-
- out_put_node:
- of_node_put(np);
-- return 0;
-+ return;
- }
--early_initcall(psci_init);
-diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c
-new file mode 100644
-index 0000000..23a1142
---- /dev/null
-+++ b/arch/arm/kernel/psci_smp.c
-@@ -0,0 +1,84 @@
-+/*
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * Copyright (C) 2012 ARM Limited
-+ *
-+ * Author: Will Deacon
-+ */
-+
-+#include
-+#include
-+#include
-+#include
-+
-+#include
-+#include
-+
-+/*
-+ * psci_smp assumes that the following is true about PSCI:
-+ *
-+ * cpu_suspend Suspend the execution on a CPU
-+ * @state we don't currently describe affinity levels, so just pass 0.
-+ * @entry_point the first instruction to be executed on return
-+ * returns 0 success, < 0 on failure
-+ *
-+ * cpu_off Power down a CPU
-+ * @state we don't currently describe affinity levels, so just pass 0.
-+ * no return on successful call
-+ *
-+ * cpu_on Power up a CPU
-+ * @cpuid cpuid of target CPU, as from MPIDR
-+ * @entry_point the first instruction to be executed on return
-+ * returns 0 success, < 0 on failure
-+ *
-+ * migrate Migrate the context to a different CPU
-+ * @cpuid cpuid of target CPU, as from MPIDR
-+ * returns 0 success, < 0 on failure
-+ *
-+ */
-+
-+extern void secondary_startup(void);
-+
-+static int __cpuinit psci_boot_secondary(unsigned int cpu,
-+ struct task_struct *idle)
-+{
-+ if (psci_ops.cpu_on)
-+ return psci_ops.cpu_on(cpu_logical_map(cpu),
-+ __pa(secondary_startup));
-+ return -ENODEV;
-+}
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+void __ref psci_cpu_die(unsigned int cpu)
-+{
-+ const struct psci_power_state ps = {
-+ .type = PSCI_POWER_STATE_TYPE_POWER_DOWN,
-+ };
-+
-+ if (psci_ops.cpu_off)
-+ psci_ops.cpu_off(ps);
-+
-+ /* We should never return */
-+ panic("psci: cpu %d failed to shutdown\n", cpu);
-+}
-+#else
-+#define psci_cpu_die NULL
-+#endif
-+
-+bool __init psci_smp_available(void)
-+{
-+ /* is cpu_on available at least? */
-+ return (psci_ops.cpu_on != NULL);
-+}
-+
-+struct smp_operations __initdata psci_smp_ops = {
-+ .smp_boot_secondary = psci_boot_secondary,
-+ .cpu_die = psci_cpu_die,
-+};
-diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
-index b4b1d39..8609524 100644
---- a/arch/arm/kernel/setup.c
-+++ b/arch/arm/kernel/setup.c
-@@ -37,6 +37,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
-@@ -796,9 +797,13 @@ void __init setup_arch(char **cmdline_p)
- unflatten_device_tree();
-
- arm_dt_init_cpu_maps();
-+ psci_init();
- #ifdef CONFIG_SMP
- if (is_smp()) {
-- smp_set_ops(mdesc->smp);
-+ if (psci_smp_available())
-+ smp_set_ops(&psci_smp_ops);
-+ else if (mdesc->smp)
-+ smp_set_ops(mdesc->smp);
- smp_init_cpus();
- }
- #endif
-diff --git a/arch/arm/mach-virt/Makefile b/arch/arm/mach-virt/Makefile
-index 042afc1..7ddbfa6 100644
---- a/arch/arm/mach-virt/Makefile
-+++ b/arch/arm/mach-virt/Makefile
-@@ -3,4 +3,3 @@
- #
-
- obj-y := virt.o
--obj-$(CONFIG_SMP) += platsmp.o
-diff --git a/arch/arm/mach-virt/platsmp.c b/arch/arm/mach-virt/platsmp.c
-deleted file mode 100644
-index f4143f5..0000000
---- a/arch/arm/mach-virt/platsmp.c
-+++ /dev/null
-@@ -1,50 +0,0 @@
--/*
-- * Dummy Virtual Machine - does what it says on the tin.
-- *
-- * Copyright (C) 2012 ARM Ltd
-- * Author: Will Deacon
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License version 2 as
-- * published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program. If not, see http://www.gnu.org/licenses/.
-- */
--
--#include
--#include
--#include
--
--#include
--#include
--
--extern void secondary_startup(void);
--
--static void __init virt_smp_init_cpus(void)
--{
--}
--
--static void __init virt_smp_prepare_cpus(unsigned int max_cpus)
--{
--}
--
--static int __cpuinit virt_boot_secondary(unsigned int cpu,
-- struct task_struct *idle)
--{
-- if (psci_ops.cpu_on)
-- return psci_ops.cpu_on(cpu_logical_map(cpu),
-- __pa(secondary_startup));
-- return -ENODEV;
--}
--
--struct smp_operations __initdata virt_smp_ops = {
-- .smp_init_cpus = virt_smp_init_cpus,
-- .smp_prepare_cpus = virt_smp_prepare_cpus,
-- .smp_boot_secondary = virt_boot_secondary,
--};
-diff --git a/arch/arm/mach-virt/virt.c b/arch/arm/mach-virt/virt.c
-index 061f283..a67d2dd 100644
---- a/arch/arm/mach-virt/virt.c
-+++ b/arch/arm/mach-virt/virt.c
-@@ -36,11 +36,8 @@ static const char *virt_dt_match[] = {
- NULL
- };
-
--extern struct smp_operations virt_smp_ops;
--
- DT_MACHINE_START(VIRT, "Dummy Virtual Machine")
- .init_irq = irqchip_init,
- .init_machine = virt_init,
-- .smp = smp_ops(virt_smp_ops),
- .dt_compat = virt_dt_match,
- MACHINE_END
---
-1.7.10.4
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-xen-0002-ARM-Enable-selection-of-SMP-operations-at-boot-time.patch new/patches.arch/arm-xen-0002-ARM-Enable-selection-of-SMP-operations-at-boot-time.patch
--- old/patches.arch/arm-xen-0002-ARM-Enable-selection-of-SMP-operations-at-boot-time.patch 2013-08-05 04:24:06.000000000 +0200
+++ new/patches.arch/arm-xen-0002-ARM-Enable-selection-of-SMP-operations-at-boot-time.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,82 +0,0 @@
-From ce9e253ecb972513a6a9f186fd4ed393cfbe94b1 Mon Sep 17 00:00:00 2001
-From: Jon Medhurst
-Date: Tue, 21 May 2013 13:40:51 +0000
-Subject: [PATCH 2/8] ARM: Enable selection of SMP operations at boot time
-Patch-Mainline: v3.11-rc1
-Git-commit: b382b940f821784107ca22de3455bb90e4512557
-
-Add a new 'smp_init' hook to machine_desc so platforms can specify a
-function to be used to setup smp ops instead of having a statically
-defined value. The hook must return true when smp_ops are initialized.
-If false the static mdesc->smp_ops will be used by default.
-
-Add the definition of "bool" by including the linux/types.h file to
-asm/mach/arch.h and make it self-contained.
-
-Signed-off-by: Jon Medhurst
-Signed-off-by: Nicolas Pitre
-Signed-off-by: Stefano Stabellini
-Signed-off-by: Nicolas Ferre
-Reviewed-by: Santosh Shilimkar
-Acked-by: Alexander Graf
----
- arch/arm/include/asm/mach/arch.h | 5 +++++
- arch/arm/kernel/setup.c | 10 ++++++----
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
-index 308ad7d..75bf079 100644
---- a/arch/arm/include/asm/mach/arch.h
-+++ b/arch/arm/include/asm/mach/arch.h
-@@ -8,6 +8,8 @@
- * published by the Free Software Foundation.
- */
-
-+#include
-+
- #ifndef __ASSEMBLY__
-
- struct tag;
-@@ -16,8 +18,10 @@ struct pt_regs;
- struct smp_operations;
- #ifdef CONFIG_SMP
- #define smp_ops(ops) (&(ops))
-+#define smp_init_ops(ops) (&(ops))
- #else
- #define smp_ops(ops) (struct smp_operations *)NULL
-+#define smp_init_ops(ops) (bool (*)(void))NULL
- #endif
-
- struct machine_desc {
-@@ -41,6 +45,7 @@ struct machine_desc {
- unsigned char reserve_lp2 :1; /* never has lp2 */
- char restart_mode; /* default restart mode */
- struct smp_operations *smp; /* SMP operations */
-+ bool (*smp_init)(void);
- void (*fixup)(struct tag *, char **,
- struct meminfo *);
- void (*reserve)(void);/* reserve mem blocks */
-diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
-index 8609524..ad84971 100644
---- a/arch/arm/kernel/setup.c
-+++ b/arch/arm/kernel/setup.c
-@@ -800,10 +800,12 @@ void __init setup_arch(char **cmdline_p)
- psci_init();
- #ifdef CONFIG_SMP
- if (is_smp()) {
-- if (psci_smp_available())
-- smp_set_ops(&psci_smp_ops);
-- else if (mdesc->smp)
-- smp_set_ops(mdesc->smp);
-+ if (!mdesc->smp_init || !mdesc->smp_init()) {
-+ if (psci_smp_available())
-+ smp_set_ops(&psci_smp_ops);
-+ else if (mdesc->smp)
-+ smp_set_ops(mdesc->smp);
-+ }
- smp_init_cpus();
- }
- #endif
---
-1.7.10.4
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-xen-0006-xen-arm-disable-cpuidle-when-linux-is-running-as-dom.patch new/patches.arch/arm-xen-0006-xen-arm-disable-cpuidle-when-linux-is-running-as-dom.patch
--- old/patches.arch/arm-xen-0006-xen-arm-disable-cpuidle-when-linux-is-running-as-dom.patch 2013-08-05 04:24:06.000000000 +0200
+++ new/patches.arch/arm-xen-0006-xen-arm-disable-cpuidle-when-linux-is-running-as-dom.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-From 732af97a0761eaabd1c7ca767e497df40f42bf66 Mon Sep 17 00:00:00 2001
-From: Julien Grall
-Date: Thu, 23 May 2013 00:01:25 +0100
-Subject: [PATCH 6/8] xen/arm: disable cpuidle when linux is running as dom0
-Patch-Mainline: Not yet
-
-When linux is running as dom0, Xen doesn't show the physical cpu but a
-virtual CPU.
-On some ARM SOC (for instance the exynos 5250), linux registers callbacks
-for cpuidle. When these callbacks are called, they will modify
-directly the physical cpu not the virtual one. It can impact the whole board
-instead of dom0.
-
-Signed-off-by: Julien Grall
-Acked-by: Alexander Graf
----
- arch/arm/xen/enlighten.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
-index 13609e0..5a2baf3 100644
---- a/arch/arm/xen/enlighten.c
-+++ b/arch/arm/xen/enlighten.c
-@@ -21,6 +21,8 @@
- #include
- #include
- #include
-+#include
-+#include
-
- #include
-
-@@ -274,6 +276,11 @@ static int __init xen_pm_init(void)
- {
- pm_power_off = xen_power_off;
- arm_pm_restart = xen_restart;
-+ /*
-+ * Making sure board specific code will not set up ops for
-+ * cpu idle and cpu freq
-+ */
-+ disable_cpuidle();
-
- return 0;
- }
---
-1.7.10.4
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-xen-0007-arm-choose-debug-uncompress.h-include-when-uncompres.patch new/patches.arch/arm-xen-0007-arm-choose-debug-uncompress.h-include-when-uncompres.patch
--- old/patches.arch/arm-xen-0007-arm-choose-debug-uncompress.h-include-when-uncompres.patch 2013-08-05 04:24:06.000000000 +0200
+++ new/patches.arch/arm-xen-0007-arm-choose-debug-uncompress.h-include-when-uncompres.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-From c86e8f0f95b9f9e236b87fe81fbc6883798228a5 Mon Sep 17 00:00:00 2001
-From: Julien Grall
-Date: Thu, 23 May 2013 15:15:17 +0100
-Subject: [PATCH 7/8] arm: choose debug/uncompress.h include when uncompress debug is disabled
-Patch-Mainline: Not yet
-
-Even if uncompress debug is disabled, some board will continue to print
-information during uncompress step.
-By using debug/uncompress.h include, all debug output will be disabled.
-
-This is usefull in Xen environment for DOM0 because the UART is stolen by
-Xen.
-
-Signed-off-by: Julien Grall
-Acked-by: Alexander Graf
----
- arch/arm/Kconfig.debug | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
-index 1d41908..66b018d 100644
---- a/arch/arm/Kconfig.debug
-+++ b/arch/arm/Kconfig.debug
-@@ -658,7 +658,7 @@ config DEBUG_UNCOMPRESS
-
- config UNCOMPRESS_INCLUDE
- string
-- default "debug/uncompress.h" if ARCH_MULTIPLATFORM
-+ default "debug/uncompress.h" if ARCH_MULTIPLATFORM || !DEBUG_UNCOMPRESS
- default "mach/uncompress.h"
-
- config EARLY_PRINTK
---
-1.7.10.4
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-xen-0008-xen-arm-enable-PV-control-for-ARM.patch new/patches.arch/arm-xen-0008-xen-arm-enable-PV-control-for-ARM.patch
--- old/patches.arch/arm-xen-0008-xen-arm-enable-PV-control-for-ARM.patch 2013-08-05 04:24:06.000000000 +0200
+++ new/patches.arch/arm-xen-0008-xen-arm-enable-PV-control-for-ARM.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-From a6bc9551509af5f8f13dd1ee5a72ff20a850be90 Mon Sep 17 00:00:00 2001
-From: Julien Grall
-Date: Fri, 7 Jun 2013 17:47:21 +0100
-Subject: [PATCH 8/8] xen/arm: enable PV control for ARM
-Patch-Mainline: Not yet
-
-Signed-off-by: Julien Grall
-Acked-by: Alexander Graf
----
- drivers/xen/Makefile | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
-index eabd0ee..a464ca3b 100644
---- a/drivers/xen/Makefile
-+++ b/drivers/xen/Makefile
-@@ -1,9 +1,8 @@
- ifneq ($(CONFIG_ARM),y)
--obj-y += manage.o
- obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
- endif
- obj-$(CONFIG_X86) += fallback.o
--obj-y += grant-table.o features.o events.o balloon.o
-+obj-y += grant-table.o features.o events.o balloon.o manage.o
- obj-y += xenbus/
-
- nostackp := $(call cc-option, -fno-stack-protector)
---
-1.7.10.4
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/ppc-prom-nodisplay.patch new/patches.arch/ppc-prom-nodisplay.patch
--- old/patches.arch/ppc-prom-nodisplay.patch 2013-08-05 04:24:06.000000000 +0200
+++ new/patches.arch/ppc-prom-nodisplay.patch 2013-09-25 16:09:40.000000000 +0200
@@ -75,5 +75,5 @@
+ if (prom_no_display == 0)
+ prom_check_displays();
- #ifdef CONFIG_PPC64
+ #if defined(CONFIG_PPC64) && defined(__BIG_ENDIAN__)
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/x86_64-unwind-annotations new/patches.arch/x86_64-unwind-annotations
--- old/patches.arch/x86_64-unwind-annotations 2013-08-05 04:24:06.000000000 +0200
+++ new/patches.arch/x86_64-unwind-annotations 2013-09-25 16:09:40.000000000 +0200
@@ -66,28 +66,6 @@
CFI_REL_OFFSET rbx, RBX+\offset
CFI_REL_OFFSET rbp, RBP+\offset
CFI_REL_OFFSET r12, R12+\offset
-@@ -488,14 +491,14 @@ ENDPROC(native_usergs_sysret64)
- .endm
-
- ENTRY(save_rest)
-- PARTIAL_FRAME 1 (REST_SKIP+8)
-+ CFI_STARTPROC
- movq 5*8+16(%rsp), %r11 /* save return address */
-- movq_cfi rbx, RBX+16
-- movq_cfi rbp, RBP+16
-- movq_cfi r12, R12+16
-- movq_cfi r13, R13+16
-- movq_cfi r14, R14+16
-- movq_cfi r15, R15+16
-+ movq %rbx, RBX+16(%rsp)
-+ movq %rbp, RBP+16(%rsp)
-+ movq %r12, R12+16(%rsp)
-+ movq %r13, R13+16(%rsp)
-+ movq %r14, R14+16(%rsp)
-+ movq %r15, R15+16(%rsp)
- movq %r11, 8(%rsp) /* return address */
- FIXUP_TOP_OF_STACK %r11, 16
- ret
@@ -505,23 +508,23 @@ END(save_rest)
/* save complete stack frame */
.pushsection .kprobes.text, "ax"
++++++ patches.drivers.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/0001-sha256_ssse3-also-test-for-BMI2.patch new/patches.drivers/0001-sha256_ssse3-also-test-for-BMI2.patch
--- old/patches.drivers/0001-sha256_ssse3-also-test-for-BMI2.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.drivers/0001-sha256_ssse3-also-test-for-BMI2.patch 2013-10-30 17:49:30.000000000 +0100
@@ -0,0 +1,34 @@
+From 3668cf5ea2806c651b42a8d99060db5c05a2f5cd Mon Sep 17 00:00:00 2001
+From: Oliver Neukum
+Date: Thu, 26 Sep 2013 14:50:19 +0200
+Subject: [PATCH] sha256_ssse3: also test for BMI2
+References: bnc#842459
+Commit: 8f20d66132a83fd5b8b78f591e6a6cf079b60760
+Patch-Mainline: v3.12
+
+The AVX2 implementation also uses BMI2 instructions,
+but doesn't test for their availability. The assumption
+that AVX2 and BMI2 always go together is false. Some
+Haswells have AVX2 but not BMI2.
+
+Signed-off-by: Oliver Neukum
+---
+ arch/x86/crypto/sha256_ssse3_glue.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/crypto/sha256_ssse3_glue.c b/arch/x86/crypto/sha256_ssse3_glue.c
+index 50226c4..e52947f 100644
+--- a/arch/x86/crypto/sha256_ssse3_glue.c
++++ b/arch/x86/crypto/sha256_ssse3_glue.c
+@@ -281,7 +281,7 @@ static int __init sha256_ssse3_mod_init(void)
+ /* allow AVX to override SSSE3, it's a little faster */
+ if (avx_usable()) {
+ #ifdef CONFIG_AS_AVX2
+- if (boot_cpu_has(X86_FEATURE_AVX2))
++ if (boot_cpu_has(X86_FEATURE_AVX2) && boot_cpu_has(X86_FEATURE_BMI2))
+ sha256_transform_asm = sha256_transform_rorx;
+ else
+ #endif
+--
+1.8.3.1
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ new/patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ
--- old/patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ 2013-10-30 17:49:05.000000000 +0100
+++ new/patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-From 6fc16e58adf50c0f1e4478538983fb5ff6f453d4 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai
-Date: Wed, 30 Oct 2013 12:29:40 +0100
-Subject: [PATCH] ALSA: hda - Add a fixup for ASUS N76VZ
-Git-commit: 6fc16e58adf50c0f1e4478538983fb5ff6f453d4
-Patch-mainline: Submitted
-References: bnc#846529
-
-ASUS N76VZ needs the same fixup as N56VZ for supporting the boost
-speaker.
-
-Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=846529
-Cc:
-Signed-off-by: Takashi Iwai
-
----
- sound/pci/hda/patch_realtek.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -4382,6 +4382,7 @@ static const struct snd_pci_quirk alc662
- SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
- SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),
- SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_ASUS_MODE4),
-+ SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_ASUS_MODE4),
- SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),
- SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2),
- SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ehea-modinfo.patch new/patches.drivers/ehea-modinfo.patch
--- old/patches.drivers/ehea-modinfo.patch 2013-10-30 17:49:05.000000000 +0100
+++ new/patches.drivers/ehea-modinfo.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-From: Olaf Hering
-Subject: ehea: add alias entry for portN properties
-References: 435215 - LTC48564
-Patch-mainline: submitted 2 May 2012 to netdev
-
-Use separate table for alias entries in the ehea module,
-otherwise the probe() function will operate on the separate ports
-instead of the lhea-"root" entry of the device-tree
-
-Signed-off-by: Jeff Mahoney
-Signed-off-by: Olaf Hering
----
- drivers/net/ethernet/ibm/ehea/ehea_main.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
---- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
-+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
-@@ -103,6 +103,19 @@ static int __devinit ehea_probe_adapter(
-
- static int ehea_remove(struct platform_device *dev);
-
-+static struct of_device_id ehea_module_device_table[] = {
-+ {
-+ .name = "lhea",
-+ .compatible = "IBM,lhea",
-+ },
-+ {
-+ .type = "network",
-+ .compatible = "IBM,lhea-ethernet",
-+ },
-+ {},
-+};
-+MODULE_DEVICE_TABLE(of, ehea_module_device_table);
-+
- static struct of_device_id ehea_device_table[] = {
- {
- .name = "lhea",
-@@ -110,7 +123,6 @@ static struct of_device_id ehea_device_t
- },
- {},
- };
--MODULE_DEVICE_TABLE(of, ehea_device_table);
-
- static struct platform_driver ehea_driver = {
- .driver = {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/gpio-ucb1400-can-be-built-as-a-module.patch new/patches.drivers/gpio-ucb1400-can-be-built-as-a-module.patch
--- old/patches.drivers/gpio-ucb1400-can-be-built-as-a-module.patch 2013-10-30 17:49:05.000000000 +0100
+++ new/patches.drivers/gpio-ucb1400-can-be-built-as-a-module.patch 2013-10-30 17:49:30.000000000 +0100
@@ -1,9 +1,8 @@
Date: Fri, 13 Sep 2013 21:41:48 +0200
From: Jean Delvare
Subject: gpio: ucb1400: Can be built as a module
-Patch-mainline: Queued in subsystem maintainer repository
-Git-repo: https://git.kernel.org/cgit/linux/kernel/git/linusw/linux-gpio.git
-Git-commit: 7d1815e1e51af36b5b52983cce8bc23cd79a92a9
+Patch-mainline: Accepted by Linus Walleij
+Git-commit: https://git.kernel.org/cgit/linux/kernel/git/linusw/linux-gpio.git/commit/?h=for-next&id=7d1815e1e51af36b5b52983cce8bc23cd79a92a9
With the recent code cleanup from Marek Vasut, driver gpio-ucb1400 can
be built as a module, so change symbol GPIO_UCB1400 from bool to
@@ -16,9 +15,9 @@
drivers/gpio/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- a/drivers/gpio/Kconfig
-+++ b/drivers/gpio/Kconfig
-@@ -670,7 +670,7 @@ config GPIO_74X164
+--- linux-3.12-rc0.orig/drivers/gpio/Kconfig 2013-09-13 20:03:47.685333351 +0200
++++ linux-3.12-rc0/drivers/gpio/Kconfig 2013-09-13 20:03:59.085333520 +0200
+@@ -703,7 +703,7 @@ config GPIO_74X164
comment "AC97 GPIO expanders:"
config GPIO_UCB1400
@@ -27,3 +26,6 @@
depends on UCB1400_CORE
help
This enables support for the Philips UCB1400 GPIO pins.
+
+
+
++++++ patches.fixes.tar.bz2 ++++++
++++ 2812 lines of diff (skipped)
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 19266 lines of diff (skipped)
++++++ patches.rpmify.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation new/patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation
--- old/patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation 2013-09-26 16:12:20.000000000 +0200
+++ new/patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-From: Jeff Mahoney
-Subject: Documentation: Fix bad merge with tmpfile documentation
-Patch-mainline: v3.12-rc2
-Git-commit: 0854d450e229e37102a76e3ccf065d8e8137846f (partial)
-
-Commit 48bde8d3 (Document ->tmpfile()) had a bad merge in vfs.txt,
-where it put the new tmpfile prototype in the middle of the atomic_open
-prototype.
-
-Signed-off-by: Jeff Mahoney
----
- Documentation/filesystems/vfs.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/Documentation/filesystems/vfs.txt 2013-07-16 00:53:43.791018403 -0400
-+++ b/Documentation/filesystems/vfs.txt 2013-07-16 00:59:16.008721223 -0400
-@@ -360,11 +360,10 @@ struct inode_operations {
- int (*removexattr) (struct dentry *, const char *);
- void (*update_time)(struct inode *, struct timespec *, int);
- int (*atomic_open)(struct inode *, struct dentry *,
-- int (*tmpfile) (struct inode *, struct dentry *, umode_t);
--} ____cacheline_aligned;
- struct file *, unsigned open_flag,
- umode_t create_mode, int *opened);
--};
-+ int (*tmpfile) (struct inode *, struct dentry *, umode_t);
-+} ____cacheline_aligned;
-
- Again, all methods are called without any locks being held, unless
- otherwise noted.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/lustre-lloop-dont-change-logical-size new/patches.rpmify/lustre-lloop-dont-change-logical-size
--- old/patches.rpmify/lustre-lloop-dont-change-logical-size 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.rpmify/lustre-lloop-dont-change-logical-size 2013-09-24 18:10:03.000000000 +0200
@@ -0,0 +1,33 @@
+From: Jeff Mahoney
+Subject: lustre/lloop: don't change the logical size for the queue
+Patch-mainline: not yet; Posted to Lustre Gerrit
+X-URL: http://review.whamcloud.com/7745
+
+On ppc64 with 64k pages, we get a build failure in lloop:
+
+drivers/staging/lustre/lustre/llite/lloop.c:527:2: note: in expansion of macro 'CLASSERT'
+CLASSERT(PAGE_CACHE_SIZE < (1 << (sizeof(unsigned short) * 8)));
+
+There's no need to change the queue's logical block size. Even if it could
+accept a 64k value, that would result in any file system on top of it
+needing to also use 64k blocks. It'd be safe to set it to 4k, but there's
+no actual need for it. It's not used to split requests except for WRITE_SAME,
+which lloop doesn't implement anyway.
+
+Signed-off-by: Jeff Mahoney
+---
+ drivers/staging/lustre/lustre/llite/lloop.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/drivers/staging/lustre/lustre/llite/lloop.c 2013-09-23 18:41:09.000000000 -0400
++++ b/drivers/staging/lustre/lustre/llite/lloop.c 2013-09-24 11:43:20.359981013 -0400
+@@ -524,9 +524,6 @@ static int loop_set_fd(struct lloop_devi
+ lo->lo_queue->queuedata = lo;
+
+ /* queue parameters */
+- CLASSERT(PAGE_CACHE_SIZE < (1 << (sizeof(unsigned short) * 8)));
+- blk_queue_logical_block_size(lo->lo_queue,
+- (unsigned short)PAGE_CACHE_SIZE);
+ blk_queue_max_hw_sectors(lo->lo_queue,
+ LLOOP_MAX_SEGMENTS << (PAGE_CACHE_SHIFT - 9));
+ blk_queue_max_segments(lo->lo_queue, LLOOP_MAX_SEGMENTS);
++++++ patches.suse.tar.bz2 ++++++
++++ 5612 lines of diff (skipped)
++++++ patches.xen.tar.bz2 ++++++
++++ 29117 lines of diff (skipped)
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.jVxcGA/_old 2013-11-25 14:33:40.000000000 +0100
+++ /var/tmp/diff_new_pack.jVxcGA/_new 2013-11-25 14:33:40.000000000 +0100
@@ -27,21 +27,16 @@
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
########################################################
- patches.kernel.org/patch-3.11.1
- patches.kernel.org/patch-3.11.1-2
- patches.kernel.org/patch-3.11.2-3
- patches.kernel.org/patch-3.11.3-4
- patches.kernel.org/patch-3.11.4-5
- patches.kernel.org/patch-3.11.5-6
+ patches.kernel.org/patch-3.12.1
########################################################
# Build fixes that apply to the vanilla kernel too.
# Patches in patches.rpmify are applied to both -vanilla
# and patched flavors.
########################################################
- patches.rpmify/documentation-fix-bad-merge-with-tmpfile-documentation
patches.rpmify/nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo
patches.rpmify/chipidea-clean-up-dependencies
+ patches.rpmify/lustre-lloop-dont-change-logical-size
########################################################
# kABI consistency patches
@@ -66,6 +61,8 @@
# kbuild/module infrastructure fixes
########################################################
patches.suse/supported-flag
+ patches.suse/supported-flag-underscores
+ patches.suse/supported-flag-wildcards
patches.suse/genksyms-add-override-flag.diff
patches.suse/kconfig-automate-kernel-desktop
@@ -115,7 +112,8 @@
+needs_update patches.arch/kvm-split-the-KVM-pv-ops-support-by-feature
+needs_update patches.arch/kvm-replace-kvm-io-delay-pv-ops-with-linux-magic
- patches.fixes/0001-sha256_ssse3-also-test-for-BMI2.patch
+ patches.drivers/0001-sha256_ssse3-also-test-for-BMI2.patch
+ patches.fixes/x86-dumpstack-Fix-printk_address-for-direct-addresse.patch
########################################################
# x86 MCE/MCA (Machine Check Error/Architecture) extensions
@@ -156,24 +154,17 @@
# ARM
########################################################
patches.arch/cubox-configuration.patch
-+needs_update patches.arch/arm-exynos-nosparse.patch
patches.arch/arm-OMAP-Fix-missing-cm3xxx.h-include.patch
patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch
- patches.arch/arm-imx-usb.patch
patches.arch/arm-omap3isp.patch
# Compile fix for Xen on ARM with our Xen patches applied
patches.arch/arm-xen-fixup.patch
patches.arch/arm-refresh-mach-types.diff
patches.arch/arm-arndale-usb.patch
-+needs_update patches.arch/arm-arndale-dma.patch
+ patches.arch/arm-arndale-dma.patch
patches.arch/arm-arndale-usb-phy.patch
patches.arch/arm-exynos-dwmmc-modalias.patch
-+needs_update patches.arch/arm-xen-0001-arm-introduce-psci_smp_ops.patch
-+needs_update patches.arch/arm-xen-0002-ARM-Enable-selection-of-SMP-operations-at-boot-time.patch
-+needs_update patches.arch/arm-xen-0006-xen-arm-disable-cpuidle-when-linux-is-running-as-dom.patch
-+needs_update patches.arch/arm-xen-0007-arm-choose-debug-uncompress.h-include-when-uncompres.patch
-+needs_update patches.arch/arm-xen-0008-xen-arm-enable-PV-control-for-ARM.patch
########################################################
# S/390
@@ -214,14 +205,11 @@
patches.arch/acpi_thermal_passive_blacklist.patch
- patches.arch/010-acpi_initrd_override_tables.patch
-
########################################################
# CPUFREQ
########################################################
+trenn patches.fixes/cpufreq_ondemand_performance_optimise_default_settings.patch
- patches.fixes/cpufreq_performance_tuning.patch
## cpuidle perf events cleanups and related
patches.arch/perf_timechart_fix_zero_timestamps.patch
@@ -233,8 +221,8 @@
########################################################
# Suse specific stuff
########################################################
- patches.suse/suse-hv-Drivers-hv-util-Fix-a-bug-in-version-negotiation-cod.patch
- patches.suse/suse-hv-Drivers-hv-util-Fix-a-bug-in-util-version-negotiatio.patch
+ # I assume this is commit 3a4916050ba2 upstream
++olh patches.suse/suse-hv-Drivers-hv-util-Fix-a-bug-in-util-version-negotiatio.patch
patches.suse/suse-hv-X86-Hyper-V-Get-the-local-APIC-timer-frequency-from-.patch
patches.suse/suse-hv-Input-add-a-driver-to-support-Hyper-V-synthetic-keyb.patch
@@ -269,57 +257,28 @@
# btrfs
########################################################
patches.suse/btrfs-use-correct-device-for-maps.patch
- patches.suse/btrfs-fall-back-to-global-reservation-when-removing-subvolumes
patches.suse/btrfs-check-index-in-extent_buffer_page
- patches.suse/btrfs-0001-Release-uuid_mutex-for-shrink-during-device-de.patch
- patches.suse/btrfs-0002-add-missing-error-checks-to-add_data_reference.patch
- patches.suse/btrfs-0003-set-qgroup_ulist-to-be-null-after-calling-ulis.patch
- patches.suse/btrfs-0004-fix-get-set-label-blocking-against-balance.patch
- patches.suse/btrfs-0006-cleanup-reloc-roots-properly-on-error.patch
- patches.suse/btrfs-0007-don-t-bother-autodefragging-if-our-root-is-goi.patch
- patches.suse/btrfs-0008-use-u64-for-subvolid-when-parsing-mount-option.patch
- patches.suse/btrfs-0009-add-missing-mounting-options-in-btrfs_show_opt.patch
- patches.suse/btrfs-0011-don-t-bug_on-when-we-fail-when-cleaning-up-tra.patch
- patches.suse/btrfs-0012-add-missing-error-check-to-find_parent_nodes.patch
- patches.suse/btrfs-0013-add-missing-error-handling-to-read_tree_block.patch
- patches.suse/btrfs-0014-handle-errors-when-doing-slow-caching.patch
- patches.suse/btrfs-0015-check-our-parent-dir-when-doing-a-compare-send.patch
- patches.suse/btrfs-0016-deal-with-enomem-in-the-rewind-path.patch
- patches.suse/btrfs-0017-stop-using-GFP_ATOMIC-when-allocating-rewind-e.patch
- patches.suse/btrfs-0018-fix-inode-leak-on-kmalloc-failure-in-tree-log..patch
- patches.suse/btrfs-0019-don-t-ignore-errors-from-btrfs_run_delayed_ite.patch
- patches.suse/btrfs-0020-return-ENOSPC-when-target-space-is-full.patch
- patches.suse/btrfs-0021-fix-possible-memory-leak-in-find_parent_nodes.patch
- patches.suse/btrfs-0023-don-t-allow-a-subvol-to-be-deleted-if-it-is-th.patch
- patches.suse/btrfs-0024-fix-the-error-handling-wrt-orphan-items.patch
- patches.suse/btrfs-0025-fix-heavy-delalloc-related-deadlock.patch
- patches.suse/btrfs-0026-fix-oops-when-writing-dirty-qgroups-to-disk.patch
- patches.suse/btrfs-0027-move-btrfs_free_qgroup_config-out-of-spin_lock.patch
- patches.suse/btrfs-0028-add-missing-error-code-to-btrfs_IOC_INO_LOOKUP.patch
- patches.suse/btrfs-0029-don-t-miss-inode-ref-items-in-btrfs_IOC_INO_LO.patch
- patches.suse/btrfs-0030-fix-memory-leak-of-orphan-block-rsv.patch
- patches.suse/btrfs-0031-fix-printing-of-non-NULL-terminated-string.patch
- patches.suse/btrfs-0032-do-not-clear-our-orphan-item-runtime-flag-on-e.patch
-+dsterba patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch
patches.suse/btrfs-relocate-csums-properly-with-prealloc-extents.patch
-+dsterba patches.suse/btrfs-fix-negative-qgroup-tracking-from-owher.patch
patches.suse/btrfs-use-end-trans-in-label-ioctl
+
patches.suse/btrfs-add-ability-to-query-change-feature-bits-online-ioctl
- patches.suse/introduce-kobj_completion
- patches.suse/btrfs-export-supported-featured-to-sysfs
- patches.suse/btrfs-add-per-super-attribute-publishing-to-sysfs
- patches.suse/btrfs-publish-per-super-features-to-sysfs
- patches.suse/btrfs-add-publishing-of-unknown-features-in-sysfs
+ patches.suse/export-kobj_sysfs_ops
+ patches.suse/btrfs-publish-supported-featured-in-sysfs
+ patches.suse/btrfs-publish-per-super-attributes-in-sysfs
+ patches.suse/btrfs-publish-per-super-features-in-sysfs
+ patches.suse/btrfs-publish-unknown-feature-bits-in-sysfs
patches.suse/btrfs-add-ability-to-change-features-via-sysfs
patches.suse/btrfs-use-feature-attributes-to-print-names-in-errors
+ patches.suse/btrfs-add-ioctl-to-export-size-of-global-metadata-reservation
+ patches.suse/btrfs-publish-allocation-data-in-sysfs
+ patches.suse/btrfs-publish-device-membership-in-sysfs
+ patches.suse/btrfs-publish-fs-label-in-sysfs
+ patches.suse/btrfs-add-tracing-for-failed-reservations
########################################################
# Reiserfs Patches
########################################################
- patches.fixes/reiserfs-locking-push-write-lock-out-of-xattr-code
- patches.fixes/reiserfs-locking-handle-nested-locks-properly
- patches.fixes/reiserfs-locking-release-lock-around-quota-operations
########################################################
# dlm
@@ -435,7 +394,6 @@
# Network
########################################################
patches.fixes/tulip-quad-NIC-ifdown
- patches.drivers/ehea-modinfo.patch
########################################################
# Wireless Networking
@@ -477,7 +435,6 @@
##########################################################
# Sound
##########################################################
- patches.drivers/ALSA-hda-Add-a-fixup-for-ASUS-N76VZ
patches.drivers/ALSA-hda-Add-extra-chmap-for-2.1-outputs-on-ASUS-lap
########################################################
@@ -492,7 +449,6 @@
+hare patches.suse/no-partition-scan
patches.drivers/gpio-ucb1400-can-be-built-as-a-module.patch
- patches.fixes/power_supply-Prevent-suspend-until-power-supply-even.patch
########################################################
# Other drivers we have added to the tree
@@ -528,7 +484,6 @@
# Security stuff
#
##########################################################
- patches.fixes/Fix-a-few-incorrectly-checked-io_-remap_pfn_range-ca.patch
##########################################################
# Audit
@@ -538,7 +493,7 @@
# AppArmor
##########################################################
patches.apparmor/apparmor-compatibility-patch-for-v5-network-control
- patches.apparmor/apparmor-profiles-seq_file
+# patches.apparmor/apparmor-profiles-seq_file
########################################################
# Address space layout randomization
@@ -628,7 +583,6 @@
patches.xen/xen3-fixup-xen
# newer changeset backports
- patches.xen/1240-pcifront-toolstack-missing-XenbusStateClosing.patch
# changes outside arch/{i386,x86_64}/xen
patches.xen/xen3-fixup-kconfig
@@ -671,13 +625,12 @@
patches.xen/xen3-patch-3.9
patches.xen/xen3-patch-3.10
patches.xen/xen3-patch-3.11
- patches.xen/xen3-patch-3.11.1-2
- patches.xen/xen3-patch-3.11.5-6
+ patches.xen/xen3-patch-3.12
# ports of other patches
- patches.xen/xen3-010-acpi_initrd_override_tables.patch
patches.xen/xen3-stack-unwind
patches.xen/xen3-x86_64-unwind-annotations
+ patches.xen/xen3-x86-dumpstack-Fix-printk_address-for-direct-addresse.patch
# bugfixes and enhancements
patches.xen/xen-hypercall-symbols
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.jVxcGA/_old 2013-11-25 14:33:40.000000000 +0100
+++ /var/tmp/diff_new_pack.jVxcGA/_new 2013-11-25 14:33:40.000000000 +0100
@@ -1,3 +1,3 @@
-2013-11-06 14:54:28 +0100
-GIT Revision: 2607707bb5fc8eb6a132671dfdf8be56978f697d
-GIT Branch: openSUSE-13.1
+2013-11-21 00:04:25 +0100
+GIT Revision: 1e06fbeab3dabef01d2a3b4d68dbf5531de7cbc9
+GIT Branch: master
++++++ supported.conf ++++++
++++ 5184 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kernel-source/supported.conf
++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/supported.conf
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org