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

Issue 773326 link

Starred by 1 user
Status: Fixed
Owner:
groeck@chromium.org
Closed: Oct 2017
Cc:
█ dtor@chromium.org
marc.her...@intel.com
reef-soc@chromium.org
eve-soc@chromium.org
sonnyrao@chromium.org
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 3
Type: Bug



Sign in to add a comment

Merge v4.4.92 into chromeos-4.4

Project Member Reported by groeck@chromium.org, Oct 10 2017 
Tracking bug for the merge of v4.4.92 into chromeos-4.4

Conflicts:
	drivers/media/usb/uvc/uvc_ctrl.c 
        kernel/seccomp.c
        fs/ext4/inode.c
        kernel/power/process.c

Comment 1 by groeck@chromium.org, Oct 10 2017

Cc: eve-soc@chromium.org sonnyrao@chromium.org marc.her...@intel.com dtor@chromium.org reef-soc@chromium.org

Comment 2 by groeck@chromium.org, Oct 13 2017

Description: Show this description

Comment 3 by groeck@chromium.org, Oct 13 2017

Summary: Merge v4.4.92 into chromeos-4.4 (was: Merge v4.4.91 into chromeos-4.4)

Comment 4 by groeck@chromium.org, Oct 13 2017

Description: Show this description
Project Member

Comment 5 by bugdroid1@chromium.org, Oct 18 2017

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

commit 67d01a61541d624af5bd221204322ec152c70688
Author: Guenter Roeck <groeck@chromium.org>
Date: Wed Oct 18 16:07:49 2017

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

Merge of v4.4.92 into chromeos-4.4

Conflicts:
	drivers/media/usb/uvc/uvc_ctrl.c
	drivers/net/wireless/marvell/mwifiex/cfg80211.c
	fs/ext4/inode.c
	kernel/power/process.c
	kernel/seccomp.c

BUG= chromium:773326 
TEST=Build and test on Eve, Kevin, Caroline with 4.4 kernel

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

[delete] https://crrev.com/4bbb171d42cf0d7e5ea8ccdb397f7b6868adba55/drivers/net/wireless/mwifiex/scan.c
[modify] https://crrev.com/67d01a61541d624af5bd221204322ec152c70688/fs/ext4/inode.c
[modify] https://crrev.com/67d01a61541d624af5bd221204322ec152c70688/kernel/seccomp.c
[delete] https://crrev.com/4bbb171d42cf0d7e5ea8ccdb397f7b6868adba55/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
[modify] https://crrev.com/67d01a61541d624af5bd221204322ec152c70688/kernel/power/process.c
[modify] https://crrev.com/67d01a61541d624af5bd221204322ec152c70688/drivers/media/usb/uvc/uvc_ctrl.c
[modify] https://crrev.com/67d01a61541d624af5bd221204322ec152c70688/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
[modify] https://crrev.com/67d01a61541d624af5bd221204322ec152c70688/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
[modify] https://crrev.com/67d01a61541d624af5bd221204322ec152c70688/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
[delete] https://crrev.com/4bbb171d42cf0d7e5ea8ccdb397f7b6868adba55/drivers/net/wireless/mwifiex/cfg80211.c
[delete] https://crrev.com/4bbb171d42cf0d7e5ea8ccdb397f7b6868adba55/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
[delete] https://crrev.com/4bbb171d42cf0d7e5ea8ccdb397f7b6868adba55/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c

Comment 6 by groeck@chromium.org, Oct 18 2017

Status: Fixed (was: Started)
►

Sign in to add a comment