linux-kernel - Re: linux-next: manual merge of the tty tree with the parisc-hd tree

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20210830173309.630f47c0@canb.auug.org.au>
Date:   Mon, 30 Aug 2021 17:33:09 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Helge Deller <deller@....de>
Cc:     Greg KH <greg@...ah.com>,
        Parisc List <linux-parisc@...r.kernel.org>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Jiri Slaby <jirislaby@...nel.org>, Jiri Slaby <jslaby@...e.cz>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the tty tree with the parisc-hd
 tree

Hi Helge,

On Mon, 30 Aug 2021 09:14:33 +0200 Helge Deller <deller@....de> wrote:
>
> On 8/30/21 7:46 AM, Stephen Rothwell wrote:
> > Today's linux-next merge of the tty tree got a conflict in:
> >
> >    arch/parisc/kernel/pdc_cons.c
> >
> > between commit:
> >
> >    9613b0cb3eb4 ("tty: pdc_cons, free tty_driver upon failure")
> >
> > from the parisc-hd tree and commits:
> >
> >    0524513afe45 ("tty: don't store semi-state into tty drivers")
> >    72fdb403008c ("tty: pdc_cons, free tty_driver upon failure")
> >
> > from the tty tree.
> >
> > I fixed it up (I just used the latter version) ...  
> 
> The latter version triggers build errors.
> Jiri's patch needs fixing. Instead of:
> +               tty_driver_kref_put(driver);
> it needs to be:
> +               tty_driver_kref_put(pdc_console_tty_driver);
> 
> Jiri, maybe you can fix it in your tree?
> I'm happy to drop the patch from my tree.

The tty tree commits first create a "driver" variable that is used
until it is clear everything works and then it is assigned to
pdc_console_tty_driver.

Just remember to tell Linus about the conflict, he will figure it out.
-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped