linux-kernel - Re: [GIT PULL] for-next updates for soc/fsl drivers for v4.20 take 2

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CADRPPNS458HcoCAQYj+jzm1O5BmVemxK4o4gdVBU2q1atJJVag@mail.gmail.com>
Date:   Fri, 5 Oct 2018 12:55:41 -0500
From:   Li Yang <leoyang.li@....com>
To:     Arnd Bergmann <arnd@...db.de>
Cc:     arm@...nel.org,
        "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" 
        <linux-arm-kernel@...ts.infradead.org>,
        lkml <linux-kernel@...r.kernel.org>,
        Shawn Guo <shawnguo@...nel.org>
Subject: Re: [GIT PULL] for-next updates for soc/fsl drivers for v4.20 take 2

On Fri, Oct 5, 2018 at 10:40 AM Arnd Bergmann <arnd@...db.de> wrote:
>
> On Thu, Oct 4, 2018 at 6:47 PM Li Yang <leoyang.li@....com> wrote:
> >
> > Hi arm-soc maintainers,
> >
> > Please merge the following updates for next.
> >
> > PS.  One of the patches is depending on the last pull request for fixes to build
> > https://patchwork.kernel.org/patch/10622883/
> > I didn't include the fix patches directly in this pull request to prevent a
> > complicated merge.  Please let me know if there is a more preferred approach
> > to deal with dependencies between pull requests.
>
> Sorry, I'd rather not pull it like this, because that would result in a
> broken branch on my side that fails to build until it gets merged with
> the other one.
>
> I think the best way to handle this is for you to:
>
> - start a branch on the afa86d264a7c commit that you already sent me
>   for 4.20.
> - merge the soc-fsl-fix-v4.19-2 branch that you sent me for 4.19 into
>   that branch
> - rebase all patches from tags/soc-fsl-next-v4.20-2 on top of the merge
> - resend the pull request with the new branch

Thanks Arnd!   Will resubmit with this approach.

>
> This will result in a bisectable (i.e. each commit builds and works) branch
> that also merges cleanly with my fixes branch.
>
> Generally speaking, every branch you send must work standalone,
> and each commit in that branch can only depend on work that
> comes earlier in that branch.
>
>        Arnd