From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Feng Tang <feng.tang@intel•com>, Len Brown <lenb@kernel•org>,
Lan Tianyu <tianyu.lan@intel•com>,
Sarah Sharp <sarah.a.sharp@linux•intel.com>
Subject: linux-next: manual merge of the usb tree with the acpi tree
Date: Mon, 24 Sep 2012 16:49:16 +1000 [thread overview]
Message-ID: <20120924164916.faeb0225ef2b0732762d8aac@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/core/usb-acpi.c between commit 59e6423ba8aa ("usb-acpi:
Comply with the ACPI API change") from the acpi tree and commit
05f916894a69 ("usb/acpi: Store info on device removability") from the usb
tree.
The latter removed the function changed by the former, so I just did that
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-09-24 6:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-24 6:49 Stephen Rothwell [this message]
2012-09-24 6:54 ` linux-next: manual merge of the usb tree with the acpi tree Stephen Rothwell
2012-09-25 22:39 ` Greg KH
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=20120924164916.faeb0225ef2b0732762d8aac@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=feng.tang@intel$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=lenb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sarah.a.sharp@linux$(echo .)intel.com \
--cc=tianyu.lan@intel$(echo .)com \
/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