Home Home > GIT Browse > stable-xen
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2017-08-31 10:24:01 -0400
committerJeff Mahoney <jeffm@suse.com>2017-08-31 10:24:01 -0400
commitdd00417366f0e79f084ed248f267199a57cbcfc9 (patch)
treecbe175a3140ecc79c96b8c9c83ce1a5a3ff7c8f6
parent896eb7ce9c83f70e818bf3efa7d9eb39c4488fa2 (diff)
Update to 4.13-rc7.
- Eliminate 2 patches.
-rw-r--r--config/arm64/default3
-rw-r--r--config/armv6hl/default3
-rw-r--r--config/armv7hl/default3
-rw-r--r--config/armv7hl/lpae3
-rw-r--r--config/i386/default2
-rw-r--r--config/i386/pae3
-rw-r--r--config/ppc64/default3
-rw-r--r--config/ppc64le/default3
-rw-r--r--config/s390x/default3
-rw-r--r--config/s390x/zfcpdump3
-rw-r--r--config/x86_64/default3
-rw-r--r--patches.drivers/ALSA-hda-Add-stereo-mic-quirk-for-Lenovo-G50-70-17aa32
-rw-r--r--patches.fixes/Input-ALPS-Fix-Alps-Touchpad-two-finger-scroll-does-133
-rw-r--r--rpm/config.sh2
-rw-r--r--series.conf2
15 files changed, 22 insertions, 179 deletions
diff --git a/config/arm64/default b/config/arm64/default
index 17096a091e..a4f2f7e8c6 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.13.0-rc6 Kernel Configuration
+# Linux/arm64 4.13.0-rc7 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
@@ -2102,6 +2102,7 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
CONFIG_SCSI_PROC_FS=y
#
diff --git a/config/armv6hl/default b/config/armv6hl/default
index 59f9e37e27..8a8f1b0f5c 100644
--- a/config/armv6hl/default
+++ b/config/armv6hl/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.13.0-rc6 Kernel Configuration
+# Linux/arm 4.13.0-rc7 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2032,6 +2032,7 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
CONFIG_SCSI_PROC_FS=y
#
diff --git a/config/armv7hl/default b/config/armv7hl/default
index 15aaed1e17..d3d24f0598 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.13.0-rc6 Kernel Configuration
+# Linux/arm 4.13.0-rc7 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2416,6 +2416,7 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
CONFIG_SCSI_PROC_FS=y
#
diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae
index a5eeec8ed9..6ea45421a7 100644
--- a/config/armv7hl/lpae
+++ b/config/armv7hl/lpae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.13.0-rc6 Kernel Configuration
+# Linux/arm 4.13.0-rc7 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2347,6 +2347,7 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
CONFIG_SCSI_PROC_FS=y
#
diff --git a/config/i386/default b/config/i386/default
index 90b74aa203..0b96e10467 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -254,6 +254,7 @@ CONFIG_SCC_TRXECHO=y
CONFIG_SCSI_AHA152X=m
CONFIG_SCSI_AHA1542=m
CONFIG_SCSI_GENERIC_NCR5380=m
+# CONFIG_SCSI_MQ_DEFAULT is not set
CONFIG_SCSI_NCR53C406A=m
CONFIG_SCSI_QLOGIC_FAS=m
CONFIG_SCSI_SYM53C416=m
@@ -309,7 +310,6 @@ CONFIG_SND_SB8_DSP=m
CONFIG_SND_SBAWE=m
CONFIG_SND_SBAWE_SEQ=m
CONFIG_SND_SC6000=m
-CONFIG_SND_SEQ_MIDI=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
CONFIG_SND_SIMPLE_SCU_CARD=m
CONFIG_SND_SOC_HDMI_CODEC=m
diff --git a/config/i386/pae b/config/i386/pae
index 2af9296ab4..25449d49e2 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.13.0-rc6 Kernel Configuration
+# Linux/i386 4.13.0-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2299,6 +2299,7 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
CONFIG_SCSI_PROC_FS=y
#
diff --git a/config/ppc64/default b/config/ppc64/default
index 6d881cb75c..3297be39c1 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.13.0-rc6 Kernel Configuration
+# Linux/powerpc 4.13.0-rc7 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1968,6 +1968,7 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=m
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
CONFIG_SCSI_PROC_FS=y
#
diff --git a/config/ppc64le/default b/config/ppc64le/default
index 1c2ee7b7d1..a7a485c920 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.13.0-rc6 Kernel Configuration
+# Linux/powerpc 4.13.0-rc7 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1874,6 +1874,7 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=m
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
CONFIG_SCSI_PROC_FS=y
#
diff --git a/config/s390x/default b/config/s390x/default
index ea4785903c..0f226189e5 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.13.0-rc6 Kernel Configuration
+# Linux/s390 4.13.0-rc7 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
@@ -1463,6 +1463,7 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=m
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
CONFIG_SCSI_PROC_FS=y
#
diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump
index 4c967058ba..4a25ef07ce 100644
--- a/config/s390x/zfcpdump
+++ b/config/s390x/zfcpdump
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.13.0-rc6 Kernel Configuration
+# Linux/s390 4.13.0-rc7 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
@@ -628,6 +628,7 @@ CONFIG_SCSI_MOD=y
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
CONFIG_SCSI_PROC_FS=y
#
diff --git a/config/x86_64/default b/config/x86_64/default
index 8c85dd13e5..d981b681ea 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.13.0-rc6 Kernel Configuration
+# Linux/x86_64 4.13.0-rc7 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -2295,6 +2295,7 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
CONFIG_SCSI_PROC_FS=y
#
diff --git a/patches.drivers/ALSA-hda-Add-stereo-mic-quirk-for-Lenovo-G50-70-17aa b/patches.drivers/ALSA-hda-Add-stereo-mic-quirk-for-Lenovo-G50-70-17aa
deleted file mode 100644
index 124bf1d5c0..0000000000
--- a/patches.drivers/ALSA-hda-Add-stereo-mic-quirk-for-Lenovo-G50-70-17aa
+++ /dev/null
@@ -1,32 +0,0 @@
-From bbba6f9d3da357bbabc6fda81e99ff5584500e76 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Wed, 23 Aug 2017 09:30:17 +0200
-Subject: [PATCH] ALSA: hda - Add stereo mic quirk for Lenovo G50-70
- (17aa:3978)
-References: bsc#1020657
-Git-commit: bbba6f9d3da357bbabc6fda81e99ff5584500e76
-Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
-Patch-mainline: Queued in subsystem maintainer repository
-
-Lenovo G50-70 (17aa:3978) with Conexant codec chip requires the
-similar workaround for the inverted stereo dmic like other Lenovo
-models.
-
-Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1020657
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
----
- sound/pci/hda/patch_conexant.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/sound/pci/hda/patch_conexant.c
-+++ b/sound/pci/hda/patch_conexant.c
-@@ -947,6 +947,7 @@ static const struct snd_pci_quirk cxt506
- SND_PCI_QUIRK(0x17aa, 0x390b, "Lenovo G50-80", CXT_FIXUP_STEREO_DMIC),
- SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),
- SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC),
-+ SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo G50-70", CXT_FIXUP_STEREO_DMIC),
- SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),
- SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad", CXT_FIXUP_THINKPAD_ACPI),
- SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004),
diff --git a/patches.fixes/Input-ALPS-Fix-Alps-Touchpad-two-finger-scroll-does- b/patches.fixes/Input-ALPS-Fix-Alps-Touchpad-two-finger-scroll-does-
deleted file mode 100644
index 0298e34646..0000000000
--- a/patches.fixes/Input-ALPS-Fix-Alps-Touchpad-two-finger-scroll-does-
+++ /dev/null
@@ -1,133 +0,0 @@
-From: Masaki Ota <masaki.ota@jp.alps.com>
-Date: Fri, 21 Jul 2017 09:27:30 +0900
-Message-Id: <20170721002730.2640-1-masaki.ota@jp.alps.com>
-Subject: [PATCH] Input: ALPS - Fix Alps Touchpad two finger scroll does not
- work on right side
-References: bsc#1050582
-Patch-mainline: v4.13-rc7
-Git-commit: 4a646580f793d19717f7e034c8d473b509c27d49
-
-Fixed the issue that two finger scroll does not work correctly
-on V8 protocol. The cause is that V8 protocol X-coordinate decode
-is wrong at SS4 PLUS device. I added SS4 PLUS X decode definition.
-
-[Mote to note: the problem itself was introduced even before the commit
- mentioned below. But the two-finger scroll worked casually although
- it reported wrong values by some reason. It got broken by the commit
- above because it changed x_max value, and this made libinput
- correctly ignoring the MT events at right-half of touchpad (the X
- coord is reported as doubled).
-
- Also, one finger event is decoded differently, thus it didn't suffer
- from this problem.
- --tiwai]
-
-Fixes: e7348396c6d5 ("Input: ALPS - fix V8+ protocol handling (73 03 28)")
-Signed-off-by: Masaki Ota <masaki.ota@jp.alps.com>
-Tested-by: Takashi Iwai <tiwai@suse.de>
-Tested-by: Paul Donohue <linux-kernel@PaulSD.com>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
----
- drivers/input/mouse/alps.c | 41 +++++++++++++++++++++++++++++++----------
- drivers/input/mouse/alps.h | 8 ++++++++
- 2 files changed, 39 insertions(+), 10 deletions(-)
-
---- a/drivers/input/mouse/alps.c
-+++ b/drivers/input/mouse/alps.c
-@@ -1215,14 +1215,24 @@ static int alps_decode_ss4_v2(struct alp
-
- case SS4_PACKET_ID_TWO:
- if (priv->flags & ALPS_BUTTONPAD) {
-- f->mt[0].x = SS4_BTL_MF_X_V2(p, 0);
-+ if (IS_SS4PLUS_DEV(priv->dev_id)) {
-+ f->mt[0].x = SS4_PLUS_BTL_MF_X_V2(p, 0);
-+ f->mt[1].x = SS4_PLUS_BTL_MF_X_V2(p, 1);
-+ } else {
-+ f->mt[0].x = SS4_BTL_MF_X_V2(p, 0);
-+ f->mt[1].x = SS4_BTL_MF_X_V2(p, 1);
-+ }
- f->mt[0].y = SS4_BTL_MF_Y_V2(p, 0);
-- f->mt[1].x = SS4_BTL_MF_X_V2(p, 1);
- f->mt[1].y = SS4_BTL_MF_Y_V2(p, 1);
- } else {
-- f->mt[0].x = SS4_STD_MF_X_V2(p, 0);
-+ if (IS_SS4PLUS_DEV(priv->dev_id)) {
-+ f->mt[0].x = SS4_PLUS_STD_MF_X_V2(p, 0);
-+ f->mt[1].x = SS4_PLUS_STD_MF_X_V2(p, 1);
-+ } else {
-+ f->mt[0].x = SS4_STD_MF_X_V2(p, 0);
-+ f->mt[1].x = SS4_STD_MF_X_V2(p, 1);
-+ }
- f->mt[0].y = SS4_STD_MF_Y_V2(p, 0);
-- f->mt[1].x = SS4_STD_MF_X_V2(p, 1);
- f->mt[1].y = SS4_STD_MF_Y_V2(p, 1);
- }
- f->pressure = SS4_MF_Z_V2(p, 0) ? 0x30 : 0;
-@@ -1239,16 +1249,27 @@ static int alps_decode_ss4_v2(struct alp
-
- case SS4_PACKET_ID_MULTI:
- if (priv->flags & ALPS_BUTTONPAD) {
-- f->mt[2].x = SS4_BTL_MF_X_V2(p, 0);
-+ if (IS_SS4PLUS_DEV(priv->dev_id)) {
-+ f->mt[0].x = SS4_PLUS_BTL_MF_X_V2(p, 0);
-+ f->mt[1].x = SS4_PLUS_BTL_MF_X_V2(p, 1);
-+ } else {
-+ f->mt[2].x = SS4_BTL_MF_X_V2(p, 0);
-+ f->mt[3].x = SS4_BTL_MF_X_V2(p, 1);
-+ }
-+
- f->mt[2].y = SS4_BTL_MF_Y_V2(p, 0);
-- f->mt[3].x = SS4_BTL_MF_X_V2(p, 1);
- f->mt[3].y = SS4_BTL_MF_Y_V2(p, 1);
- no_data_x = SS4_MFPACKET_NO_AX_BL;
- no_data_y = SS4_MFPACKET_NO_AY_BL;
- } else {
-- f->mt[2].x = SS4_STD_MF_X_V2(p, 0);
-+ if (IS_SS4PLUS_DEV(priv->dev_id)) {
-+ f->mt[0].x = SS4_PLUS_STD_MF_X_V2(p, 0);
-+ f->mt[1].x = SS4_PLUS_STD_MF_X_V2(p, 1);
-+ } else {
-+ f->mt[0].x = SS4_STD_MF_X_V2(p, 0);
-+ f->mt[1].x = SS4_STD_MF_X_V2(p, 1);
-+ }
- f->mt[2].y = SS4_STD_MF_Y_V2(p, 0);
-- f->mt[3].x = SS4_STD_MF_X_V2(p, 1);
- f->mt[3].y = SS4_STD_MF_Y_V2(p, 1);
- no_data_x = SS4_MFPACKET_NO_AX;
- no_data_y = SS4_MFPACKET_NO_AY;
-@@ -2541,8 +2562,8 @@ static int alps_set_defaults_ss4_v2(stru
-
- memset(otp, 0, sizeof(otp));
-
-- if (alps_get_otp_values_ss4_v2(psmouse, 0, &otp[0][0]) ||
-- alps_get_otp_values_ss4_v2(psmouse, 1, &otp[1][0]))
-+ if (alps_get_otp_values_ss4_v2(psmouse, 1, &otp[1][0]) ||
-+ alps_get_otp_values_ss4_v2(psmouse, 0, &otp[0][0]))
- return -1;
-
- alps_update_device_area_ss4_v2(otp, priv);
---- a/drivers/input/mouse/alps.h
-+++ b/drivers/input/mouse/alps.h
-@@ -100,6 +100,10 @@ enum SS4_PACKET_ID {
- ((_b[1 + _i * 3] << 5) & 0x1F00) \
- )
-
-+#define SS4_PLUS_STD_MF_X_V2(_b, _i) (((_b[0 + (_i) * 3] << 4) & 0x0070) | \
-+ ((_b[1 + (_i) * 3] << 4) & 0x0F80) \
-+ )
-+
- #define SS4_STD_MF_Y_V2(_b, _i) (((_b[1 + (_i) * 3] << 3) & 0x0010) | \
- ((_b[2 + (_i) * 3] << 5) & 0x01E0) | \
- ((_b[2 + (_i) * 3] << 4) & 0x0E00) \
-@@ -109,6 +113,10 @@ enum SS4_PACKET_ID {
- ((_b[0 + (_i) * 3] >> 3) & 0x0010) \
- )
-
-+#define SS4_PLUS_BTL_MF_X_V2(_b, _i) (SS4_PLUS_STD_MF_X_V2(_b, _i) | \
-+ ((_b[0 + (_i) * 3] >> 4) & 0x0008) \
-+ )
-+
- #define SS4_BTL_MF_Y_V2(_b, _i) (SS4_STD_MF_Y_V2(_b, _i) | \
- ((_b[0 + (_i) * 3] >> 3) & 0x0008) \
- )
diff --git a/rpm/config.sh b/rpm/config.sh
index b47c2988e0..f4a7b83d4c 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.13-rc6
+SRCVERSION=4.13-rc7
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against
diff --git a/series.conf b/series.conf
index 3182082098..be8b33bf51 100644
--- a/series.conf
+++ b/series.conf
@@ -358,14 +358,12 @@
########################################################
# patches.suse/SUSE-bootsplash
# patches.suse/SUSE-bootsplash-mgadrmfb-workaround
- patches.fixes/Input-ALPS-Fix-Alps-Touchpad-two-finger-scroll-does-
##########################################################
# Sound
##########################################################
patches.drivers/ALSA-hda-Implement-mic-mute-LED-mode-enum
patches.drivers/ALSA-ice1712-Add-support-for-STAudio-ADCIII
- patches.drivers/ALSA-hda-Add-stereo-mic-quirk-for-Lenovo-G50-70-17aa
########################################################
# Char / serial