* linux-next: manual merge of the bkl-llseek tree with the staging-next tree
@ 2010-09-21 6:06 Stephen Rothwell
2010-09-21 13:31 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-09-21 6:06 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, Sven Eckelmann, Greg Kroah-Hartman
[-- Attachment #1: Type: text/plain, Size: 590 bytes --]
Hi Arnd,
Today's linux-next merge of the bkl-llseek tree got conflicts in
drivers/staging/batman-adv/icmp_socket.c and
drivers/staging/batman-adv/bat_debugfs.c between commit
2d77bb592f6cabc5ee5322c03ee92b9f96c45f60 ("Staging: batman-adv: Mark
debugfs files as nonseekable") from the staging-next tree and commit
5295184fb318693b4ef2cd8056bf1a7cb43586d7 ("llseek: automatically
add .llseek fop") from the bkl-llseek tree.
I used the versions from the staging-next tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the bkl-llseek tree with the staging-next tree
2010-09-21 6:06 linux-next: manual merge of the bkl-llseek tree with the staging-next tree Stephen Rothwell
@ 2010-09-21 13:31 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2010-09-21 13:31 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Arnd Bergmann, linux-next, linux-kernel, Sven Eckelmann
On Tue, Sep 21, 2010 at 04:06:37PM +1000, Stephen Rothwell wrote:
> Hi Arnd,
>
> Today's linux-next merge of the bkl-llseek tree got conflicts in
> drivers/staging/batman-adv/icmp_socket.c and
> drivers/staging/batman-adv/bat_debugfs.c between commit
> 2d77bb592f6cabc5ee5322c03ee92b9f96c45f60 ("Staging: batman-adv: Mark
> debugfs files as nonseekable") from the staging-next tree and commit
> 5295184fb318693b4ef2cd8056bf1a7cb43586d7 ("llseek: automatically
> add .llseek fop") from the bkl-llseek tree.
>
> I used the versions from the staging-next tree.
That sounds correct, thanks for letting us know.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-21 13:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-21 6:06 linux-next: manual merge of the bkl-llseek tree with the staging-next tree Stephen Rothwell
2010-09-21 13:31 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox