Merge v4.4.169 into chromeos-4.4 |
|||
Issue descriptionMerge v4.4.169 into chromeos-4.4
,
Dec 25
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/9aa43b29e9586bac1cfd908466b3b474aafd23ca commit 9aa43b29e9586bac1cfd908466b3b474aafd23ca Author: Guenter Roeck <groeck@chromium.org> Date: Sat Dec 22 15:59:16 2018 CHROMIUM: Merge 'v4.4.169' into chromeos-4.4 Merge of v4.4.169 into chromeos-4.4 Conflicts: lib/rbtree_test.c Changelog: ---------------------------------------------------------------- Aaro Koskinen (1): MMC: OMAP: fix broken MMC on OMAP15XX/OMAP5910/OMAP310 Adamski, Krzysztof (Nokia - PL/Wroclaw) (1): i2c: axxia: properly handle master timeout Alexey Khoroshilov (1): mac80211_hwsim: fix module init error paths for netlink Anderson Luiz Alves (1): mv88e6060: disable hardware level MAC learning Brian Norris (1): Revert "drm/rockchip: Allow driver to be shutdown on reboot/kexec" Cathy Avery (1): scsi: vmw_pscsi: Rearrange code to avoid multiple calls to free_irq during unload Chen-Yu Tsai (1): pinctrl: sunxi: a83t: Fix IRQ offset typo for PH11 Chris Cole (1): ARM: 8814/1: mm: improve/fix ARM v7_dma_inv_range() unaligned address handling Dan Carpenter (2): clk: mmp: Off by one in mmp_clk_add() ALSA: isa/wavefront: prevent some out of bound writes Davidlohr Bueso (5): lib/interval_tree_test.c: make test options module parameters lib/interval_tree_test.c: allow full tree search lib/rbtree_test.c: make input module parameters lib/rbtree-test: lower default params lib/interval_tree_test.c: allow users to limit scope of endpoint Emmanuel Grumbach (1): mac80211: don't WARN on bad WMM parameters from buggy APs Fred Herard (1): scsi: libiscsi: Fix NULL pointer dereference in iscsi_eh_session_reset Greg Kroah-Hartman (1): Linux 4.4.169 Guenter Roeck (2): powerpc/boot: Fix random libfdt related build errors Merge remote-tracking branch 'origin/linux/v4.4.169' into merge/chromeos-4.4-v4.4.169 Guy Shapiro (1): rtc: snvs: add a missing write sync Hans de Goede (1): i2c: scmi: Fix probe error on devices with an empty SMB0001 ACPI device node Ilan Peer (1): mac80211: Fix condition validating WMM IE Ingo Molnar (1): timer/debug: Change /proc/timer_list from 0444 to 0400 Jeff Moyer (1): aio: fix spectre gadget in lookup_ioctx Jose Abreu (1): ARC: io.h: Implement reads{x}()/writes{x}() Juha-Matti Tilli (1): libata: whitelist all SAMSUNG MZ7KM* solid-state disks Radu Rendec (1): powerpc/msi: Fix NULL pointer access in teardown code Sean Paul (1): drm/msm: Grab a vblank reference when waiting for commit_done Steve French (1): cifs: In Kconfig CONFIG_CIFS_POSIX needs depends on legacy (insecure cifs) Steven Rostedt (VMware) (2): tracing: Fix memory leak in set_trigger_filter() tracing: Fix memory leak of instance function hash filters Toni Peltonen (1): bonding: fix 802.3ad state sent to partner when unbinding slave Tony Lindgren (1): Input: omap-keypad - fix keyboard debounce configuration Trent Piepho (1): rtc: snvs: Add timeouts to avoid kernel lockups Trond Myklebust (1): SUNRPC: Fix a potential race in xprt_connect() Yangtao Li (4): sbus: char: add of_node_put() drivers/sbus/char: add of_node_put() drivers/tty: add missing of_node_put() ide: pmac: add of_node_put() YiFei Zhu (1): x86/earlyprintk/efi: Fix infinite loop on some screen widths Yunlei He (1): f2fs: fix a panic caused by NULL flush_cmd_control Makefile | 2 +- arch/arc/include/asm/io.h | 72 ++++++++++++++++++++ arch/arm/mm/cache-v7.S | 8 ++- arch/powerpc/boot/Makefile | 3 +- arch/powerpc/kernel/msi.c | 7 +- arch/x86/platform/efi/early_printk.c | 2 +- drivers/ata/libata-core.c | 1 + drivers/clk/mmp/clk.c | 2 +- drivers/gpu/drm/msm/msm_atomic.c | 5 ++ drivers/i2c/busses/i2c-axxia.c | 40 ++++++++--- drivers/i2c/busses/i2c-scmi.c | 10 ++- drivers/ide/pmac.c | 1 + drivers/input/keyboard/omap4-keypad.c | 18 +++-- drivers/mmc/host/omap.c | 11 ++- drivers/net/bonding/bond_3ad.c | 3 + drivers/net/dsa/mv88e6060.c | 10 +-- drivers/net/wireless/mac80211_hwsim.c | 12 ++-- drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 2 +- drivers/rtc/rtc-snvs.c | 104 +++++++++++++++++++---------- drivers/sbus/char/display7seg.c | 1 + drivers/sbus/char/envctrl.c | 2 + drivers/scsi/libiscsi.c | 4 +- drivers/scsi/vmw_pvscsi.c | 4 +- drivers/tty/serial/suncore.c | 1 + fs/aio.c | 2 + fs/cifs/Kconfig | 2 +- fs/f2fs/segment.c | 5 +- kernel/time/timer_list.c | 2 +- kernel/trace/ftrace.c | 1 + kernel/trace/trace_events_trigger.c | 6 +- net/mac80211/mlme.c | 3 +- net/sunrpc/xprt.c | 11 ++- sound/isa/wavefront/wavefront_synth.c | 9 +++ 33 files changed, 279 insertions(+), 87 deletions(-) BUG= chromium:917219 TEST=Build and test on various affected systems Change-Id: I79ca3c0509886dc7f56854e374f3bdd64878cc47 Signed-off-by: Guenter Roeck <groeck@chromium.org> [modify] https://crrev.com/9aa43b29e9586bac1cfd908466b3b474aafd23ca/lib/rbtree_test.c
,
Dec 25
|
|||
►
Sign in to add a comment |
|||
Comment 1 by groeck@chromium.org
, Dec 22