redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

Browse source 
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  sysfs: use sysfs_attr_init in ASUS atk0110 driver
  Documentation/HOWTO: update git home URL
  Documentation: -stable rules: upstream commit ID requirement reworded
This commit is contained in:
Linus Torvalds 2010-04-22 18:24:27 -07:00
parent 7db2ccddd1 a30dcb4f68
commit a2340be047
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/HOWTO
View file

@ -234,7 +234,7 @@ process is as follows:
Linus, usually the patches that have already been included in the Linus, usually the patches that have already been included in the
-next kernel for a few weeks. The preferred way to submit big changes -next kernel for a few weeks. The preferred way to submit big changes
is using git (the kernel's source management tool, more information is using git (the kernel's source management tool, more information
can be found at http://git.or.cz/) but plain patches are also just can be found at http://git-scm.com/) but plain patches are also just
fine. fine.
- After two weeks a -rc1 kernel is released it is now possible to push - After two weeks a -rc1 kernel is released it is now possible to push
only patches that do not include new features that could affect the only patches that do not include new features that could affect the

9
Documentation/stable_kernel_rules.txt
View file

@ -18,16 +18,15 @@ Rules on what kind of patches are accepted, and which ones are not, into the
- It cannot contain any "trivial" fixes in it (spelling changes, - It cannot contain any "trivial" fixes in it (spelling changes,
whitespace cleanups, etc). whitespace cleanups, etc).
- It must follow the Documentation/SubmittingPatches rules. - It must follow the Documentation/SubmittingPatches rules.
- It or an equivalent fix must already exist in Linus' tree. Quote the - It or an equivalent fix must already exist in Linus' tree (upstream).
respective commit ID in Linus' tree in your patch submission to -stable.
Procedure for submitting patches to the -stable tree: Procedure for submitting patches to the -stable tree:
- Send the patch, after verifying that it follows the above rules, to - Send the patch, after verifying that it follows the above rules, to
stable@kernel.org. stable@kernel.org. You must note the upstream commit ID in the changelog
- To have the patch automatically included in the stable tree, add the of your submission.
the tag - To have the patch automatically included in the stable tree, add the tag
Cc: stable@kernel.org Cc: stable@kernel.org
in the sign-off area. Once the patch is merged it will be applied to in the sign-off area. Once the patch is merged it will be applied to
the stable tree without anything else needing to be done by the author the stable tree without anything else needing to be done by the author

4
drivers/hwmon/asus_atk0110.c
View file

@ -1169,15 +1169,19 @@ static int atk_create_files(struct atk_data *data)
int err; int err;
list_for_each_entry(s, &data->sensor_list, list) { list_for_each_entry(s, &data->sensor_list, list) {
sysfs_attr_init(&s->input_attr.attr);
err = device_create_file(data->hwmon_dev, &s->input_attr); err = device_create_file(data->hwmon_dev, &s->input_attr);
if (err) if (err)
return err; return err;
sysfs_attr_init(&s->label_attr.attr);
err = device_create_file(data->hwmon_dev, &s->label_attr); err = device_create_file(data->hwmon_dev, &s->label_attr);
if (err) if (err)
return err; return err;
sysfs_attr_init(&s->limit1_attr.attr);
err = device_create_file(data->hwmon_dev, &s->limit1_attr); err = device_create_file(data->hwmon_dev, &s->limit1_attr);
if (err) if (err)
return err; return err;
sysfs_attr_init(&s->limit2_attr.attr);
err = device_create_file(data->hwmon_dev, &s->limit2_attr); err = device_create_file(data->hwmon_dev, &s->limit2_attr);
if (err) if (err)
return err; return err;