From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
John Kacur <jkacur@redhat.com>, Takashi Iwai <tiwai@suse.de>
Subject: linux-next: manual merge of the bkl-llseek tree with the sound tree
Date: Fri, 24 Sep 2010 13:42:01 +1000 [thread overview]
Message-ID: <20100924134201.e6385b98.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 646 bytes --]
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
reply other threads:[~2010-09-24 3:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100924134201.e6385b98.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=jkacur@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox