New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 725164 link

Starred by 2 users

Issue metadata

Status: Fixed
Owner:
Closed: Jun 2017
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 3
Type: Bug



Sign in to add a comment

Merge v4.4.70 into chromeos-4.4

Project Member Reported by groeck@chromium.org, May 22 2017

Issue description

The following patch has been reverted from v4.4.70 prior to the merge
since it was already applied to avoid unnecessary conflicts.
    
        a7544fdd1626 staging/android/ion :
                     fix a race condition in the ion driver

The following patch has been reverted from chromeos-4.4 prior to the merge
since the underlying problem was fixed differently upstream, and we are
picking up the upstream version as part of the merge.
        0ebfa4910c78 FROMLIST: fscrypt: use 32 bytes of encrypted filename

Conflicts:
        drivers/media/tuners/tuner-xc2028.c (use local version)

 

Comment 1 by groeck@chromium.org, May 25 2017

Owner: groeck@chromium.org
Status: Started (was: Untriaged)

Comment 2 by groeck@chromium.org, May 25 2017

Components: OS>Kernel

Comment 3 by groeck@chromium.org, May 26 2017

Summary: Merge v4.4.70 into chromeos-4.4 (was: Merge v4.4.69 into chromeos-4.4)
Test matrix:
# Target: one paladin, 2 release builds per architecture, no overlap if possible
# Platform	Architecture	paladin	release
# banjo		BayTrail	x
# bob		RK3399			x
# clapper	BayTrail		x
# eve		Kabylake-Y	x	x
# fizz		Kabylake-U	x	x
# gru		RK3399		x
# kahlee	Stoney Ridge	x	x
# kevin		RK3399			x
# lakitu	virtual		x	x
# pyro		Apollo Lake		x
# quawks	BayTrail		x
# reef		Apollo Lake	x
# rowan		MT8176		x	x
# snappy	Apollo Lake		x
# soraka	Kabylake-Y		x

Comment 4 by groeck@chromium.org, May 26 2017

Description: Show this description

Comment 5 by groeck@chromium.org, May 26 2017

Cc: eve-soc@chromium.org james.au...@intel.com marc.her...@intel.com reef-soc@chromium.org poppy-soc@chromium.org fizz-soc@chromium.org

Comment 6 by groeck@chromium.org, May 26 2017

Cc: gwendal@chromium.org
Project Member

Comment 7 by bugdroid1@chromium.org, Jun 8 2017

Labels: merge-merged-chromeos-4.4
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/d8c4b682591e4c596bbb93fbf2308faa6a71f0a6

commit d8c4b682591e4c596bbb93fbf2308faa6a71f0a6
Author: Guenter Roeck <groeck@chromium.org>
Date: Thu Jun 08 17:24:01 2017

CHROMIUM: Merge tag 'v4.4.70' into chromeos-4.4

Merge of v4.4.70 into chromeos-4.4

The following patch has been reverted from v4.4.70 prior to the merge
since it was already applied to avoid unnecessary conflicts.

	a7544fdd1626 staging/android/ion :
			fix a race condition in the ion driver

The following patch has been reverted from chromeos-4.4 prior to the merge
since the underlying problem was fixed differently upstream, and we are
picking up the upstream version as part of the merge.
	0ebfa4910c78 FROMLIST: fscrypt: use 32 bytes of encrypted filename

Conflicts:
	drivers/media/tuners/tuner-xc2028.c (use local version)

BUG= chromium:725164 
TEST=Build and test on Eve, Kevin, Chell with 4.4 kernel

Change-Id: Icd27e3cf3b2013079f1105db4ce612ab62501f79
Signed-off-by: Guenter Roeck <groeck@chromium.org>

[modify] https://crrev.com/d8c4b682591e4c596bbb93fbf2308faa6a71f0a6/drivers/net/wireless/st/cw1200/sta.c
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/rt2x00/rt2800lib.h
[modify] https://crrev.com/d8c4b682591e4c596bbb93fbf2308faa6a71f0a6/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/mwifiex/11n_aggr.c
[modify] https://crrev.com/d8c4b682591e4c596bbb93fbf2308faa6a71f0a6/drivers/net/wireless/st/cw1200/sta.h
[modify] https://crrev.com/d8c4b682591e4c596bbb93fbf2308faa6a71f0a6/drivers/net/wireless/intel/iwlegacy/4965-mac.c
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/mwifiex/debugfs.c
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/rt2x00/rt2800lib.c
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/cw1200/sta.c
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/cw1200/sta.h
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/iwlwifi/dvm/mac80211.c
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/iwlwifi/mvm/mac80211.c
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/hostap/hostap_hw.c
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/iwlegacy/4965.h
[modify] https://crrev.com/d8c4b682591e4c596bbb93fbf2308faa6a71f0a6/drivers/net/wireless/intel/iwlegacy/4965.h
[modify] https://crrev.com/d8c4b682591e4c596bbb93fbf2308faa6a71f0a6/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
[modify] https://crrev.com/d8c4b682591e4c596bbb93fbf2308faa6a71f0a6/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
[modify] https://crrev.com/d8c4b682591e4c596bbb93fbf2308faa6a71f0a6/drivers/net/wireless/marvell/mwl8k.c
[modify] https://crrev.com/d8c4b682591e4c596bbb93fbf2308faa6a71f0a6/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
[modify] https://crrev.com/d8c4b682591e4c596bbb93fbf2308faa6a71f0a6/drivers/net/wireless/intersil/hostap/hostap_hw.c
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/brcm80211/brcmfmac/core.c
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/iwlegacy/4965-mac.c
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/mwifiex/pcie.c
[modify] https://crrev.com/d8c4b682591e4c596bbb93fbf2308faa6a71f0a6/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/mwifiex/sta_ioctl.c
[delete] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/drivers/net/wireless/mwl8k.c
[modify] https://crrev.com/d8c4b682591e4c596bbb93fbf2308faa6a71f0a6/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c

Project Member

Comment 8 by bugdroid1@chromium.org, Jun 8 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ec92ab9bcea598a11ba38e331c11018e46cfc3e7

commit ec92ab9bcea598a11ba38e331c11018e46cfc3e7
Author: Guenter Roeck <groeck@chromium.org>
Date: Thu Jun 08 17:23:58 2017

Revert "FROMLIST: fscrypt: use 32 bytes of encrypted filename"

This reverts commit 0ebfa4910c78cca8d8005bd26d8e457a99e20374.

Prepare for merge of v4.4.70 into chromeos-4.4: the underlying problem
has been fixed differently in the upstream kernel, and we are picking up
the upstream version with the merge.

BUG= chromium:725164 
TEST=Build and test on Kevin, Gru, Reef, Chell with 4.4 kernel

CQ-DEPEND=CL:498851
Change-Id: Id4bb9c4e5fd3680e9a58781322671a7273406c21
Signed-off-by: Guenter Roeck <groeck@chromium.org>

[modify] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/fs/ext4/crypto_fname.c
[modify] https://crrev.com/ec92ab9bcea598a11ba38e331c11018e46cfc3e7/fs/ext4/namei.c

Status: Fixed (was: Started)

Sign in to add a comment