APPLIED: [PATCH][BIONIC] UBUNTU: SAUCE: Allow mounting datasets more than once (LP: #1759848)

[Seth Forshee]

On Thu, Mar 29, 2018 at 10:37:57PM +0100, Colin Ian King wrote:
> On 29/03/18 19:42, Seth Forshee wrote:
> > On Thu, Mar 29, 2018 at 06:07:02PM +0100, Colin King wrote:
> > 
> > <snip>
> > 
> >> diff --git a/zfs/META b/zfs/META
> >> index 9531bb8..c5dcb8e 100644
> >> --- a/zfs/META
> >> +++ b/zfs/META
> >> @@ -2,7 +2,7 @@ Meta:         1
> >>  Name:         zfs
> >>  Branch:       1.0
> >>  Version:      0.7.5
> >> -Release:      1ubuntu12~1
> >> +Release:      1ubuntu13
> > 
> > I hit a conflict here as the bionic kernel currently has 1ubuntu12 here.
> > That's the only conflict and easy enough to resolve, but I wanted to
> > double check that there aren't any other changes missing that you
> > expected to be present.
> 
> yep, once again I hit a sync issue from the previous commit I was
> working on. I think it should be:

Thanks. Applied to bionic/master-next.