From: Greg KH <gregkh@suse•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Arnd Bergmann <arnd@arndb•de>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Sven Eckelmann <sven.eckelmann@gmx•de>
Subject: Re: linux-next: manual merge of the bkl-llseek tree with the staging-next tree
Date: Tue, 21 Sep 2010 06:31:31 -0700 [thread overview]
Message-ID: <20100921133131.GB2751@suse.de> (raw)
In-Reply-To: <20100921160637.c61d4322.sfr@canb.auug.org.au>
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
prev parent reply other threads:[~2010-09-21 13:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=20100921133131.GB2751@suse.de \
--to=gregkh@suse$(echo .)de \
--cc=arnd@arndb$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=sven.eckelmann@gmx$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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