* linux-next: manual merge of the bkl-ioctl tree with the staging-next tree
@ 2010-04-27 4:48 Stephen Rothwell
2010-04-27 15:14 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-04-27 4:48 UTC (permalink / raw)
To: "Frédéric Weisbecker"
Cc: linux-next, linux-kernel, Linus Torvalds, Vijay Kumar, Greg KH
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the bkl-ioctl tree with the staging-next tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2010-04-27 15:14 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Frédéric Weisbecker, linux-next, linux-kernel,
Linus Torvalds, Vijay Kumar
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-27 15:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox