linux-kernel - Re: [GIT] Networking

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: <CAPBZ5QcpooNi=YnGJJxM020LO=Z_GAM_teGiE5gLKX-g9xhcHQ@mail.gmail.com>
Date:   Wed, 24 Oct 2018 14:28:47 +0100
From:   Andy Gross <andy.gross@...aro.org>
To:     "Valo, Kalle" <kvalo@....qualcomm.com>
Cc:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Bjorn Andersson <bjorn.andersson@...aro.org>,
        govinds@...eaurora.org, "David S. Miller" <davem@...emloft.net>,
        Andrew Morton <akpm@...ux-foundation.org>,
        netdev <netdev@...r.kernel.org>,
        Linux Kernel list <linux-kernel@...r.kernel.org>,
        linux-wireless@...r.kernel.org, ath10k@...ts.infradead.org,
        jeffrey.t.kirsher@...el.com,
        Niklas Cassel <niklas.cassel@...aro.org>,
        David Brown <david.brown@...aro.org>
Subject: Re: [GIT] Networking

Sorry for spam, I am resending in cleartext because the previous
missed the lists.  Thanks Google for resetting my config when you
'upgraded'.

On Wed, 24 Oct 2018 at 09:05, Kalle Valo <kvalo@....qualcomm.com> wrote:
>
> Kalle Valo <kvalo@...eaurora.org> writes:
>
> > Linus Torvalds <torvalds@...ux-foundation.org> writes:
> >
> >> On Wed, Oct 24, 2018 at 7:01 AM Linus Torvalds
> >> <torvalds@...ux-foundation.org> wrote:
> >>>
> >>> Hmm. Tentatively pulled, but there's something wrong with the Kconfig rules.
> >>
> >> Confirmed.
> >
> > BTW, our emails crossed and more info in the other email[1].
> >
> >> I did a978a5b8d83f ("net/kconfig: Make QCOM_QMI_HELPERS available when
> >> COMPILE_TEST") to fix the breakage.
> >
> > Thanks, though I don't see it yet as I guess you haven't pushed it yet.
> > Do note that it _might_ conflict the other commit which I suspect is in
> > also coming to you:
> >
> > ccfb464cd106 ("soc: qcom: Allow COMPILE_TEST of qcom SoC Kconfigs")
>
> git.kernel.org is alive again for me so I can now check both commits. It
> seems that Niklas' commit[1] is more finegrained than what Linus did[2].
> I guess either of the commits should be reverted when Niklas' commit
> goes to Linus tree, or what's the best course of action?

Yes this will conflict with Niklas's patch which is part of the 4.20
pull requests.  I would prefer that we revert Linus's and take
Niklas's unless there is a compelling argument to have it fixed before
-rc1.  That said, if you didn't, the merge conflicts would be minor
and easily handled.

Regards,
Andy Gross