linux-kernel - Re: linux-next: manual merge of the driver-core tree with the reset 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: <cc2eeff6-d7d9-45a9-a681-793053f0f26c@sirena.org.uk>
Date: Mon, 24 Jun 2024 19:05:30 +0100
From: Mark Brown <broonie@...nel.org>
To: Greg KH <greg@...ah.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Philipp Zabel <p.zabel@...gutronix.de>,
	Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
Subject: Re: linux-next: manual merge of the driver-core tree with the reset
 tree

On Mon, Jun 24, 2024 at 07:47:56PM +0200, Greg KH wrote:
> On Mon, Jun 24, 2024 at 06:35:57PM +0100, Mark Brown wrote:

> > diff --cc drivers/reset/reset-meson-audio-arb.c
> > index 894ad9d37a665,8740f5f6abf80..0000000000000
> > --- a/drivers/reset/reset-meson-audio-arb.c
> > +++ b/drivers/reset/reset-meson-audio-arb.c

> No diff for the conflict?

That's what happens when the merge winds up bringing in no changes.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)