linux-kernel - linux-next: manual merge of the bkl-llseek tree with the sound 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>] [day] [month] [year] [list]

Date:	Fri, 24 Sep 2010 13:42:01 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	John Kacur <jkacur@...hat.com>, Takashi Iwai <tiwai@...e.de>
Subject: linux-next: manual merge of the bkl-llseek tree with the sound tree

Hi Arnd,

Today's linux-next merge of the bkl-llseek tree got a conflict in
sound/oss/sh_dac_audio.c between commit
095a0f6df246bdc57b57d616c4698e41fbd3bf43 ("SOUND-OSS: Remove
sh_dac_audio") from the sound tree and commit
5295184fb318693b4ef2cd8056bf1a7cb43586d7 ("llseek: automatically
add .llseek fop") from the bkl-llseek tree.

The former just removes the file updated by the latter.  I just removed
the file.

Arnd, (assuming that you will do a rebase anyway) you may as well just
drop the hunk that affects this file.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped