linux-next: manual merge of the driver-core.current tree

linux-next: manual merge of the driver-core.current tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 609 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core.current tree got a conflict
in Documentation/sysctl/kernel.txt between commit
061b1bd394ca8628b7c24eb4658ba3535da4249a ("Staging: add TAINT_CRAP for
all drivers/staging code") from Linus' tree and commit
ac7b643ad9c570efa0b5cbc9af5581db8c2faf64 ("Document kernel taint flags
properly") from the driver-core.current tree.

So the Documentation patch in the former commit was not right (64 v 1024
for TAINT_CRAP) ...

I took the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the driver-core.current tree

[Greg KH]

On Mon, Oct 20, 2008 at 11:48:42AM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core.current tree got a conflict
> in Documentation/sysctl/kernel.txt between commit
> 061b1bd394ca8628b7c24eb4658ba3535da4249a ("Staging: add TAINT_CRAP for
> all drivers/staging code") from Linus' tree and commit
> ac7b643ad9c570efa0b5cbc9af5581db8c2faf64 ("Document kernel taint flags
> properly") from the driver-core.current tree.

That's odd, I'll check this tomorrow when I resync my tree (it still
contains a lot of stuff that is in Linus's tree right now), I haven't
had the chance to clean it out yet.

thanks,

greg k-h

linux-next: manual merge of the driver-core.current tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 592 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core.current tree got a conflict
in drivers/dca/dca-sysfs.c between commit
7f1b358a236ee9c19657a619ac6f2dcabcaa0924 ("I/OAT: I/OAT version 3.0
support") from Linus' tree and commit
25070eca3d7d3a04e45ceeb37c15ef73800817b0 ("device create: misc: convert
device_create_drvdata to device_create") from the driver-core.current
tree.

The former changed the last parameter to device_create_drvdata().  I did
the obvious fixup.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the driver-core.current tree

[Greg KH]

On Thu, Jul 24, 2008 at 10:57:53AM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core.current tree got a conflict
> in drivers/dca/dca-sysfs.c between commit
> 7f1b358a236ee9c19657a619ac6f2dcabcaa0924 ("I/OAT: I/OAT version 3.0
> support") from Linus' tree and commit
> 25070eca3d7d3a04e45ceeb37c15ef73800817b0 ("device create: misc: convert
> device_create_drvdata to device_create") from the driver-core.current
> tree.
> 
> The former changed the last parameter to device_create_drvdata().  I did
> the obvious fixup.

Thanks, I'll do the same when I rebase today.

greg k-h