From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: linux-next: manual merge of the usb tree with the vfs tree
Date: Tue, 1 May 2012 09:46:46 -0400 [thread overview]
Message-ID: <20120501134646.GD31954@kroah.com> (raw)
In-Reply-To: <20120501150416.3b900d70af5f5173908aca00@canb.auug.org.au>
On Tue, May 01, 2012 at 03:04:16PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/core/inode.c between commit eaf5fb5977e0 ("switch usbfs to
> use of simple_{unlink,rmdir}") from the tree and commit fb28d58b72aa
> ("USB: remove CONFIG_USB_DEVICEFS") from the usb tree.
>
> The latter removes the file modified by the former, so I just removed the
> file.
That sounds correct to me, thanks for doing this.
greg k-h
prev parent reply other threads:[~2012-05-01 13:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-01 5:04 linux-next: manual merge of the usb tree with the vfs tree Stephen Rothwell
2012-05-01 13:46 ` 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=20120501134646.GD31954@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@zeniv.linux.org.uk \
/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.