From: Greg Kroah-Hartman Date: Fri, 7 Dec 2018 13:05:28 +0000 (+0100) Subject: Merge tag 'gnss-4.20-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan... X-Git-Tag: v5.4-rc1~2080^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dbde117c31263fb632a5bfcafe4fe769663e8991;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'gnss-4.20-rc6' of https://git./linux/kernel/git/johan/gnss into char-misc-linus Johan writes: GNSS fixes for 4.20-rc6 Here's a fix for a broken activation retry loop in the sirf driver. Included are also two MAINTAINERS updates. All have been in linux-next with no reported issues. Signed-off-by: Johan Hovold * tag 'gnss-4.20-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss: MAINTAINERS: exclude gnss from SIRFPRIMA2 regex matching MAINTAINERS: add gnss scm tree gnss: sirf: fix activation retry handling --- dbde117c31263fb632a5bfcafe4fe769663e8991