linux-kernel - Re: linux-next: manual merge of the usb tree with the acpi tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20120925223921.GB6282@kroah.com>
Date:	Tue, 25 Sep 2012 15:39:21 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Feng Tang <feng.tang@...el.com>, Len Brown <lenb@...nel.org>,
	Lan Tianyu <tianyu.lan@...el.com>,
	Sarah Sharp <sarah.a.sharp@...ux.intel.com>
Subject: Re: linux-next: manual merge of the usb tree with the acpi tree

On Mon, Sep 24, 2012 at 04:54:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Mon, 24 Sep 2012 16:49:16 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > 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).
> 
> It also needed this merge fix patch:
> 
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Mon, 24 Sep 2012 16:51:38 +1000
> Subject: [PATCH] usb-acpi: Comply with the ACPI API change after usb tree
>  merge
> 
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  drivers/usb/core/usb-acpi.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Ick, thanks for this, hopefully Len handles this properly during the
merge window :)

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/