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: <CAHp75Vc==m3mE1TtxjHnpwL-d8W4rFnKreu7XB7MWspJKCCOGA@mail.gmail.com>
Date: Wed, 15 Jan 2025 17:08:41 +0200
From: Andy Shevchenko <andy.shevchenko@...il.com>
To: Andre Werner <andre.werner@...tec-electronic.com>
Cc: Andy Shevchenko <andy@...nel.org>, gregkh@...uxfoundation.org, jirislaby@...nel.org, 
	hvilleneuve@...onoff.com, devicetree@...r.kernel.org, 
	linux-kernel@...r.kernel.org, linux-serial@...r.kernel.org, 
	lech.perczak@...lingroup.com, krzk+dt@...nel.org, conor+dt@...nel.org, 
	robh@...nel.org
Subject: Re: [External Email] Re: [PATCH v7 2/2] serial: sc16is7xx: Add
 polling mode if no IRQ pin is available

On Wed, Jan 15, 2025 at 7:23 AM Andre Werner
<andre.werner@...tec-electronic.com> wrote:
> On Tue, 14 Jan 2025, Andy Shevchenko wrote:
> > On Tue, Jan 14, 2025 at 08:04:49AM +0100, Andre Werner wrote:

...

> > > V6:
> > > - Use polling mode for IRQ numbers <= 0 which encounter no valid IRQ
> > >   were found/defined.
> > > V7:
> > > - Try to improve and unify comments as requested.
> > > - Fix typo in commit message: pull -> poll
> >
> > Please, rebase your series on top of the recent Linux Next.
>
> I performed the rebase and get a single new commit to fix the merge
> conflicts. How do you expect the submission? Is it a new commit or
> should I mark it as a fixup? Shall it have new version number v8 or
> is it a full new commit series?

When you rebase you should not get _merge_ conflicts.
What is expected is that the first (DT binding) commit will be gone
from your local branch, followed by the shrunken / conflicting second
one.

-- 
With Best Regards,
Andy Shevchenko

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ