Hi Greg,
do you want to take these two patches through your tree?
Or should I take them through my microblaze tree?
Thanks,
Michal
On 05/23/2013 02:31 PM, Michal Simek wrote:
> From: Graeme Smecher <[email protected]>
>
> This fixes a bug introduced in 5d10302f46d, where device trees that don't
> provide the "port-number" attribute are mistakenly assigned the device "xs`".
> The error check that's supposed to assign a default letter can't succeed,
> since it tests an unsigned type against a negative return code.
>
> Signed-off-by: Graeme Smecher <[email protected]>
> Signed-off-by: Michal Simek <[email protected]>
> Acked-by: Grant Likely <[email protected]>
> ---
> drivers/block/xsysace.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
> index f8ef15f..3fd130f 100644
> --- a/drivers/block/xsysace.c
> +++ b/drivers/block/xsysace.c
> @@ -1160,8 +1160,7 @@ static int ace_probe(struct platform_device *dev)
> dev_dbg(&dev->dev, "ace_probe(%p)\n", dev);
>
> /* device id and bus width */
> - of_property_read_u32(dev->dev.of_node, "port-number", &id);
> - if (id < 0)
> + if (of_property_read_u32(dev->dev.of_node, "port-number", &id))
> id = 0;
> if (of_find_property(dev->dev.of_node, "8-bit", NULL))
> bus_width = ACE_BUS_WIDTH_8;
> --
> 1.8.2.3
>
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
On Mon, Jun 03, 2013 at 02:47:36PM +0200, Michal Simek wrote:
> Hi Greg,
>
> do you want to take these two patches through your tree?
Why would I be sending in drivers/block/* patches? I don't have a tree
for that, do I?
> Or should I take them through my microblaze tree?
Please do, or send them to the block maintainer.
thanks,
greg k-h
On 06/03/2013 04:22 PM, Greg Kroah-Hartman wrote:
> On Mon, Jun 03, 2013 at 02:47:36PM +0200, Michal Simek wrote:
>> Hi Greg,
>>
>> do you want to take these two patches through your tree?
>
> Why would I be sending in drivers/block/* patches? I don't have a tree
> for that, do I?
Ah ok. I took you because you are 3rd based on get_maintainer patch (50% commit signer)
>> Or should I take them through my microblaze tree?
>
> Please do, or send them to the block maintainer.
Who is drivers/block maintainer? I can't see anyone in MAINTAINERS file.
I should probably also change systemace record too.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
On Mon, Jun 03, 2013 at 04:33:12PM +0200, Michal Simek wrote:
> On 06/03/2013 04:22 PM, Greg Kroah-Hartman wrote:
> > On Mon, Jun 03, 2013 at 02:47:36PM +0200, Michal Simek wrote:
> >> Hi Greg,
> >>
> >> do you want to take these two patches through your tree?
> >
> > Why would I be sending in drivers/block/* patches? I don't have a tree
> > for that, do I?
>
> Ah ok. I took you because you are 3rd based on get_maintainer patch (50% commit signer)
>
>
> >> Or should I take them through my microblaze tree?
> >
> > Please do, or send them to the block maintainer.
>
> Who is drivers/block maintainer? I can't see anyone in MAINTAINERS file.
Jens is the block/ maintainer, so I imagine he's also the drivers/block/
maintainer as well. If not, he would know who.
thanks,
greg k-h
On 06/03/2013 04:37 PM, Greg Kroah-Hartman wrote:
> On Mon, Jun 03, 2013 at 04:33:12PM +0200, Michal Simek wrote:
>> On 06/03/2013 04:22 PM, Greg Kroah-Hartman wrote:
>>> On Mon, Jun 03, 2013 at 02:47:36PM +0200, Michal Simek wrote:
>>>> Hi Greg,
>>>>
>>>> do you want to take these two patches through your tree?
>>>
>>> Why would I be sending in drivers/block/* patches? I don't have a tree
>>> for that, do I?
>>
>> Ah ok. I took you because you are 3rd based on get_maintainer patch (50% commit signer)
>>
>>
>>>> Or should I take them through my microblaze tree?
>>>
>>> Please do, or send them to the block maintainer.
>>
>> Who is drivers/block maintainer? I can't see anyone in MAINTAINERS file.
>
> Jens is the block/ maintainer, so I imagine he's also the drivers/block/
> maintainer as well. If not, he would know who.
>
We have nice follow up on this. It was applied as different patch to Linus tree.
commit 585dc0c2f68981c02a0bb6fc8fe191a3f513959c
Author: Gernot Vormayr <[email protected]>
Date: Fri May 24 15:55:03 2013 -0700
drivers/block/xsysace.c: fix id with missing port-number
If the port number is missing from the device-tree the device gets named
xs` instead of xsa. This fixes the check for missing ids.
Tested on ml507 board.
Signed-off-by: Gernot Vormayr <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Jens Axboe <[email protected]>
Cc: Grant Likely <[email protected]>
Cc: Rob Herring <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
M
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform