On Tue, Jun 26, 2018 at 01:14:28PM -0700, Olof Johansson wrote: > On Tue, Jun 26, 2018 at 10:42 AM, Olof Johansson <olof@xxxxxxxxx> wrote: > > On Tue, Jun 26, 2018 at 02:08:13AM -0500, Andy Gross wrote: > >> The following changes since commit 9573ce74d3bc797758cbd55194aae1b7248f2503: > >> > >> Merge tag 'qcom-fixes-for-4.18-rc1' into linus (2018-06-25 23:53:28 -0500) > > Hmm, I just noticed this. It is the kind of thing Linus sometimes gets > upset about when it gets excessive (merge-backs). > > You should just have based this second branch on top of the first one > without that merge. Or was it needed due to some conflict? No this was an honest mistake on my part. There wasn't any need to merge in the -rc1 as a base. My apologies. Regards, Andy -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
