From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Frédéric Weisbecker" <fweisbec@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Linus Torvalds" <torvalds@linux-foundation.org>,
"Vijay Kumar" <vijaykumar@bravegnu.org>
Subject: Re: linux-next: manual merge of the bkl-ioctl tree with the staging-next tree
Date: Tue, 27 Apr 2010 08:14:15 -0700 [thread overview]
Message-ID: <20100427151415.GC7653@kroah.com> (raw)
In-Reply-To: <20100427144804.cbfa9564.sfr@canb.auug.org.au>
On Tue, Apr 27, 2010 at 02:48:04PM +1000, Stephen Rothwell wrote:
> Hi Frédéric,
>
> Today's linux-next merge of the bkl-ioctl tree got a conflict in
> drivers/staging/poch/poch.c between commit
> ba7d84da197c348efa2b2984a848e0fbccd4b9b0 ("Staging: Remove staging/poch")
> from the staging-next tree and commit
> 1dd97d3d546aa14db7efa5366b21d1336b91379e ("Rename 'struct
> file_operations' 'ioctl' fn pointer to 'bkl_ioctl'") from the bkl-ioctl
> tree.
>
> The former just removed the file, so I did as well.
That's the correct fix :)
thanks,
greg k-h
prev parent reply other threads:[~2010-04-27 15:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-27 4:48 linux-next: manual merge of the bkl-ioctl tree with the staging-next tree Stephen Rothwell
2010-04-27 15:14 ` 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=20100427151415.GC7653@kroah.com \
--to=greg@kroah.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
--cc=vijaykumar@bravegnu.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.