On Mon, 13 Jan 2020, Kirill Smelkov wrote:

> On Mon, Jan 13, 2020 at 10:32:53AM -0800, Todd Kjos wrote:
> > > tree:   https://android.googlesource.com/kernel/common android-4.9-o-mr1
> >
> > Looks like the comment was related to an issue found on the
> > android-4.9-o-mr1 branch which doesn't get LTS merges and is really
> > just a patch repository for patches cited in the Android Security
> > Bulletin. We don't do general bug-fixes or take LTS merges on that
> > branch.
>
> Greg, Todd, thanks for feedback. Indeed, it was about android-4.9-o-mr1,
> which I mistakenly attributed to only android-4.9-o . Good to hear that
> main Android branches are in a good shape.
>
> Julia, if I understand correctly, it seems it is better to remove -mrX
> branches from being tracked by kbuild robot as that is causing
> confusion to people.

I forwarded the request to Philip Li.

thanks,
julia



>
> Kirill
>
> > On Mon, Jan 13, 2020 at 10:21 AM Greg Kroah-Hartman
> > <gregkh@linuxfoundation.org> wrote:
> > >
> > > On Mon, Jan 13, 2020 at 06:04:44PM +0000, Kirill Smelkov wrote:
> > > > Android people,
> > > >
> > > > Please see inside if Android 4.9-o wants to pick up stream_open
> > > > related deadlock fixes. FUSE part of it is already applied to upstream
> > > > stable/linux-4.9.y as 9c829b6e3fe2 and cfd8d2e79524, but the Android
> > > > tree does not have any of the fixes at all.
> > >
> > > I do not understand, the commit 10dce8af3422 ("fs: stream_open - opener
> > > for stream-like files so that read and write can run simultaneously
> > > without deadlock") is commit 9c829b6e3fe2 in the linux stable 4.9 branch
> > > and commit bbd84f33652f ("fuse: Add FOPEN_STREAM to use stream_open()")
> > > is commit cfd8d2e79524 in the linux stable 4.9 branch, right?
> > >
> > > If so, that commit is in the 4.9.181 release, which _is_ included in all
> > > of the android common branches already, as all of the LTS/stable kernel
> > > releases are merged into the android common trees.
> > >
> > > Right now the tip-of-tree of the android-4.9-o branch is 2641bba251cd
> > > ("Merge 4.9.209 into android-4.9-o") so of course 4.9.181 is also in
> > > there :)
> > >
> > > So I really do not understand what you are asking about here.  Is there
> > > a specific patch that did not get into the stable releases that you feel
> > > should go only into the android tree?  If so, what is that upstream
> > > commit and why wouldn't it go into the stable releases?
> > >
> > > confused,
> > >
> > > greg k-h
> > >
> > > --
> > > You received this message because you are subscribed to the Google Groups "cros-kernel-buildreports" group.
> > > To unsubscribe from this group and stop receiving emails from it, send an email to cros-kernel-buildreports+unsubscribe(a)googlegroups.com.
> > > To view this discussion on the web visit https://groups.google.com/d/msgid/cros-kernel-buildreports/20200113182145.GA411698%40kroah.com.
>