public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
* Linux 3.0.80
@ 2013-05-24 18:23 Greg KH
  2013-05-24 18:23 ` Greg KH
  2013-06-07  9:09 ` Li Zefan
  0 siblings, 2 replies; 5+ messages in thread
From: Greg KH @ 2013-05-24 18:23 UTC (permalink / raw)
  To: linux-kernel, Andrew Morton, torvalds, stable; +Cc: lwn, Jiri Slaby

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

I'm announcing the release of the 3.0.80 kernel.

All users of the 3.0 kernel series must upgrade.

The updated 3.0.y git tree can be found at:
	git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.y
and can be browsed at the normal kernel.org git web browser:
	http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Makefile                              |    2 +-
 drivers/hwmon/abituguru.c             |   16 ++++++++++------
 drivers/media/dvb/mantis/mantis_dvb.c |    6 ++++--
 fs/btrfs/ioctl.c                      |   10 +++++-----
 4 files changed, 20 insertions(+), 14 deletions(-)

Alan Cox (1):
      media: mantis: fix silly crash case

Gabriel de Perthuis (1):
      btrfs: don't stop searching after encountering the wrong item

Greg Kroah-Hartman (1):
      Linux 3.0.80

Wei Yongjun (1):
      hwmon: fix error return code in abituguru_probe()


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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: Linux 3.0.80
  2013-05-24 18:23 Linux 3.0.80 Greg KH
@ 2013-05-24 18:23 ` Greg KH
  2013-06-07  9:09 ` Li Zefan
  1 sibling, 0 replies; 5+ messages in thread
From: Greg KH @ 2013-05-24 18:23 UTC (permalink / raw)
  To: linux-kernel, Andrew Morton, torvalds, stable; +Cc: lwn, Jiri Slaby


diff --git a/Makefile b/Makefile
index f8ade05..dad194f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 0
-SUBLEVEL = 79
+SUBLEVEL = 80
 EXTRAVERSION =
 NAME = Sneaky Weasel
 
diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c
index 65a35cf..61ab615 100644
--- a/drivers/hwmon/abituguru.c
+++ b/drivers/hwmon/abituguru.c
@@ -1280,14 +1280,18 @@ static int __devinit abituguru_probe(struct platform_device *pdev)
 	pr_info("found Abit uGuru\n");
 
 	/* Register sysfs hooks */
-	for (i = 0; i < sysfs_attr_i; i++)
-		if (device_create_file(&pdev->dev,
-				&data->sysfs_attr[i].dev_attr))
+	for (i = 0; i < sysfs_attr_i; i++) {
+		res = device_create_file(&pdev->dev,
+					 &data->sysfs_attr[i].dev_attr);
+		if (res)
 			goto abituguru_probe_error;
-	for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++)
-		if (device_create_file(&pdev->dev,
-				&abituguru_sysfs_attr[i].dev_attr))
+	}
+	for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++) {
+		res = device_create_file(&pdev->dev,
+					 &abituguru_sysfs_attr[i].dev_attr);
+		if (res)
 			goto abituguru_probe_error;
+	}
 
 	data->hwmon_dev = hwmon_device_register(&pdev->dev);
 	if (!IS_ERR(data->hwmon_dev))
diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/dvb/mantis/mantis_dvb.c
index e5180e4..5d15c6b 100644
--- a/drivers/media/dvb/mantis/mantis_dvb.c
+++ b/drivers/media/dvb/mantis/mantis_dvb.c
@@ -248,8 +248,10 @@ int __devinit mantis_dvb_init(struct mantis_pci *mantis)
 err5:
 	tasklet_kill(&mantis->tasklet);
 	dvb_net_release(&mantis->dvbnet);
-	dvb_unregister_frontend(mantis->fe);
-	dvb_frontend_detach(mantis->fe);
+	if (mantis->fe) {
+		dvb_unregister_frontend(mantis->fe);
+		dvb_frontend_detach(mantis->fe);
+	}
 err4:
 	mantis->demux.dmx.remove_frontend(&mantis->demux.dmx, &mantis->fe_mem);
 
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index a3c4751..a205027 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1539,7 +1539,11 @@ static noinline int copy_to_sk(struct btrfs_root *root,
 		item_off = btrfs_item_ptr_offset(leaf, i);
 		item_len = btrfs_item_size_nr(leaf, i);
 
-		if (item_len > BTRFS_SEARCH_ARGS_BUFSIZE)
+		btrfs_item_key_to_cpu(leaf, key, i);
+		if (!key_in_sk(key, sk))
+			continue;
+
+		if (sizeof(sh) + item_len > BTRFS_SEARCH_ARGS_BUFSIZE)
 			item_len = 0;
 
 		if (sizeof(sh) + item_len + *sk_offset >
@@ -1548,10 +1552,6 @@ static noinline int copy_to_sk(struct btrfs_root *root,
 			goto overflow;
 		}
 
-		btrfs_item_key_to_cpu(leaf, key, i);
-		if (!key_in_sk(key, sk))
-			continue;
-
 		sh.objectid = key->objectid;
 		sh.offset = key->offset;
 		sh.type = key->type;

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: Linux 3.0.80
  2013-05-24 18:23 Linux 3.0.80 Greg KH
  2013-05-24 18:23 ` Greg KH
@ 2013-06-07  9:09 ` Li Zefan
  2013-06-07 15:10   ` Greg KH
  1 sibling, 1 reply; 5+ messages in thread
From: Li Zefan @ 2013-06-07  9:09 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-kernel, Andrew Morton, torvalds, stable, lwn, Jiri Slaby

On 2013/5/25 2:23, Greg KH wrote:
> I'm announcing the release of the 3.0.80 kernel.
> 
> All users of the 3.0 kernel series must upgrade.
> 
> The updated 3.0.y git tree can be found at:
> 	git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.y
> and can be browsed at the normal kernel.org git web browser:
> 	http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
> 
> thanks,
> 
> greg k-h
> 
> ------------
> 
>  Makefile                              |    2 +-
>  drivers/hwmon/abituguru.c             |   16 ++++++++++------
>  drivers/media/dvb/mantis/mantis_dvb.c |    6 ++++--
>  fs/btrfs/ioctl.c                      |   10 +++++-----
>  4 files changed, 20 insertions(+), 14 deletions(-)
> 

3.0.80 failed to boot, and looks like the culprit is blkcg, so I disabled
CONFIG_CGROUP and it boot successfully.

I haven't tried 3.0.81, as it's not released yet.


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: Linux 3.0.80
  2013-06-07  9:09 ` Li Zefan
@ 2013-06-07 15:10   ` Greg KH
  2013-06-09  1:39     ` Li Zefan
  0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2013-06-07 15:10 UTC (permalink / raw)
  To: Li Zefan; +Cc: linux-kernel, Andrew Morton, torvalds, stable, lwn, Jiri Slaby

On Fri, Jun 07, 2013 at 05:09:16PM +0800, Li Zefan wrote:
> On 2013/5/25 2:23, Greg KH wrote:
> > I'm announcing the release of the 3.0.80 kernel.
> > 
> > All users of the 3.0 kernel series must upgrade.
> > 
> > The updated 3.0.y git tree can be found at:
> > 	git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.y
> > and can be browsed at the normal kernel.org git web browser:
> > 	http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
> > 
> > thanks,
> > 
> > greg k-h
> > 
> > ------------
> > 
> >  Makefile                              |    2 +-
> >  drivers/hwmon/abituguru.c             |   16 ++++++++++------
> >  drivers/media/dvb/mantis/mantis_dvb.c |    6 ++++--
> >  fs/btrfs/ioctl.c                      |   10 +++++-----
> >  4 files changed, 20 insertions(+), 14 deletions(-)
> > 
> 
> 3.0.80 failed to boot, and looks like the culprit is blkcg, so I disabled
> CONFIG_CGROUP and it boot successfully.

Did 3.0.79 boot properly with this same hardware / kernel configuration?
If so, can you bisect it down to the problem commit please?

> I haven't tried 3.0.81, as it's not released yet.

Give me a few hours, but odds are, it's not fixed, as I have not heard
of this problem before.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: Linux 3.0.80
  2013-06-07 15:10   ` Greg KH
@ 2013-06-09  1:39     ` Li Zefan
  0 siblings, 0 replies; 5+ messages in thread
From: Li Zefan @ 2013-06-09  1:39 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-kernel, Andrew Morton, torvalds, stable, lwn, Jiri Slaby

On 2013/6/7 23:10, Greg KH wrote:
> On Fri, Jun 07, 2013 at 05:09:16PM +0800, Li Zefan wrote:
>> On 2013/5/25 2:23, Greg KH wrote:
>>> I'm announcing the release of the 3.0.80 kernel.
>>>
>>> All users of the 3.0 kernel series must upgrade.
>>>
>>> The updated 3.0.y git tree can be found at:
>>> 	git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.y
>>> and can be browsed at the normal kernel.org git web browser:
>>> 	http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
>>>
>>> thanks,
>>>
>>> greg k-h
>>>
>>> ------------
>>>
>>>  Makefile                              |    2 +-
>>>  drivers/hwmon/abituguru.c             |   16 ++++++++++------
>>>  drivers/media/dvb/mantis/mantis_dvb.c |    6 ++++--
>>>  fs/btrfs/ioctl.c                      |   10 +++++-----
>>>  4 files changed, 20 insertions(+), 14 deletions(-)
>>>
>>
>> 3.0.80 failed to boot, and looks like the culprit is blkcg, so I disabled
>> CONFIG_CGROUP and it boot successfully.
> 
> Did 3.0.79 boot properly with this same hardware / kernel configuration?
> If so, can you bisect it down to the problem commit please?
> 

Now I remember occasionally the kernel failed to boot, and it's not specific
to 3.0... Sorry for the noise.


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2013-06-09  1:39 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-24 18:23 Linux 3.0.80 Greg KH
2013-05-24 18:23 ` Greg KH
2013-06-07  9:09 ` Li Zefan
2013-06-07 15:10   ` Greg KH
2013-06-09  1:39     ` Li Zefan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox