Skip to contentSkip to conversation

Miscellaneous trivialities

GIT PULL Michael Witten 4 participants 7 messages Aug 15, 2013 – Aug 20, 2013 1 message not in the archive

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

I've been sitting on some trivial patches for a while, and I'd just like to get them out of the way.

Here is the series:

[1] Docs: Kconfig: For readability, offset modifiers with commas
[2] Docs: Kconfig: Use consistent whitespace indentation
[3] Docs: Kconfig: Clean up the radiotap documentation
[4] Docs: Kconfig: devlopers' -> developers'
[5] Docs: Replace hotplug' with udev'
[6] DRM: comment: halve -> half
[7] DRM: comment: gdm_proc_lists -> drm_proc_lists
[8] DRM: cleanup: Remove unused `gamma_size'

  Documentation/networking/README.ipw2200 |   5 +-
  drivers/gpu/drm/drm_fb_helper.c         |   3 -
  drivers/gpu/drm/drm_irq.c               |   4 +-
  drivers/gpu/drm/drm_proc.c              |   2 +-
  drivers/net/wireless/ipw2x00/Kconfig    | 102 ++++++++++++++++----------------
  fs/btrfs/Kconfig                        |   3 +-
  init/Kconfig                            |   4 +-
  7 files changed, 60 insertions(+), 63 deletions(-)

Those commits merge cleanly with:

28fbc8b6a29c849a3f03a6b05010d4b584055665
Merge branch 'sched-urgent-for-linus' of

    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
    (2013-08-13 16:58:17 -0700)

and they can be pulled from here:

https://github.com/mfwitten/linux.git trivial/misc/0

While it is much easier to review the individual commits, a combined diff is appended to the end of this email in case that is convenient.

Sincerely
Michael Witten

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

Documentation/networking/README.ipw2200 +2 -3
index b7658be..aeb6494 100644
@@ -256,7 +256,7 @@ You can set the debug level via:
 
 Where $VALUE would be a number in the case of this sysfs entry.  The 
 input to sysfs files does not have to be a number.  For example, the 
-firmware loader used by hotplug utilizes sysfs entries for transferring 
+firmware loader used by udev utilizes sysfs entries for transferring
 the firmware image from user space into the driver.
 
 The Intel(R) PRO/Wireless 2915ABG Driver for Linux exposes sysfs entries 
@@ -425,8 +425,7 @@ are made to the driver.  Currently, there are no major changes planned.
 ----------------------------------------------
 
 The driver requires a firmware image, download it and extract the
-files under /lib/firmware (or wherever your hotplug's firmware.agent
-will look for firmware files)
+files under /lib/firmware (or wherever udev will look for firmware files)
 
 The firmware can be downloaded from the following URL:
 
drivers/gpu/drm/drm_fb_helper.c +0 -3
index 3d13ca6e2..a6aab13 100644
@@ -888,7 +888,6 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 	int i;
 	struct fb_info *info;
 	struct drm_fb_helper_surface_size sizes;
-	int gamma_size = 0;
 
 	memset(&sizes, 0, sizeof(struct drm_fb_helper_surface_size));
 	sizes.surface_depth = 24;
@@ -938,8 +937,6 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 		desired_mode = fb_helper->crtc_info[i].desired_mode;
 
 		if (desired_mode) {
-			if (gamma_size == 0)
-				gamma_size = fb_helper->crtc_info[i].mode_set.crtc->gamma_size;
 			if (desired_mode->hdisplay < sizes.fb_width)
 				sizes.fb_width = desired_mode->hdisplay;
 			if (desired_mode->vdisplay < sizes.fb_height)
drivers/gpu/drm/drm_irq.c +2 -2
index f92da0a..062dc22 100644
@@ -497,8 +497,8 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc)
 	/* Dot clock in Hz: */
 	dotclock = (u64) crtc->hwmode.clock * 1000;
 
-	/* Fields of interlaced scanout modes are only halve a frame duration.
-	 * Double the dotclock to get halve the frame-/line-/pixelduration.
+	/* Fields of interlaced scanout modes are only half a frame duration.
+	 * Double the dotclock to get half the frame-/line-/pixelduration.
 	 */
 	if (crtc->hwmode.flags & DRM_MODE_FLAG_INTERLACE)
 		dotclock *= 2;
drivers/gpu/drm/drm_proc.c +1 -1
index d7f2324..f7cec4e 100644
@@ -87,7 +87,7 @@ static const struct file_operations drm_proc_fops = {
  * \return Zero on success, non-zero on failure
  *
  * Create a given set of proc files represented by an array of
- * gdm_proc_lists in the given root directory.
+ * drm_proc_lists in the given root directory.
  */
 static int drm_proc_create_files(const struct drm_info_list *files, int count,
 			  struct proc_dir_entry *root, struct drm_minor *minor)
drivers/net/wireless/ipw2x00/Kconfig +51 -51

153 lines not on this page · raw message

fs/btrfs/Kconfig +2 -1
index 2b3b832..e374bf9 100644
@@ -59,7 +59,8 @@ config BTRFS_FS_RUN_SANITY_TESTS
 	help
 	  This will run some basic sanity tests on the free space cache
 	  code to make sure it is acting as it should.  These are mostly
-	  regression tests and are only really interesting to btrfs devlopers.
+	  regression tests and are only really interesting to btrfs
+	  developers.
 
 	  If unsure, say N.
 
init/Kconfig +2 -2
index 247084b..6ba39b6 100644
@@ -1093,7 +1093,7 @@ config UTS_NS
 	bool "UTS namespace"
 	default y
 	help
-	  In this namespace tasks see different info provided with the
+	  In this namespace, tasks see different info provided with the
 	  uname() system call
 
 config IPC_NS
@@ -1101,7 +1101,7 @@ config IPC_NS
 	depends on (SYSVIPC || POSIX_MQUEUE)
 	default y
 	help
-	  In this namespace tasks work with IPC ids which correspond to
+	  In this namespace, tasks work with IPC ids which correspond to
 	  different IPC objects in different namespaces.
 
 config USER_NS
reviewer Acked-by
#1 lore raw
Quoted 30 lines · Michael Witten

I've been sitting on some trivial patches for a while, and I'd just like to get them out of the way.

Here is the series:

[1] Docs: Kconfig: For readability, offset modifiers with commas
[2] Docs: Kconfig: Use consistent whitespace indentation
[3] Docs: Kconfig: Clean up the radiotap documentation
[4] Docs: Kconfig: devlopers' -> developers'
[5] Docs: Replace hotplug' with udev'
[6] DRM: comment: halve -> half
[7] DRM: comment: gdm_proc_lists -> drm_proc_lists
[8] DRM: cleanup: Remove unused `gamma_size'

  Documentation/networking/README.ipw2200 |   5 +-
  drivers/gpu/drm/drm_fb_helper.c         |   3 -
  drivers/gpu/drm/drm_irq.c               |   4 +-
  drivers/gpu/drm/drm_proc.c              |   2 +-
  drivers/net/wireless/ipw2x00/Kconfig    | 102 ++++++++++++++++----------------
  fs/btrfs/Kconfig                        |   3 +-
  init/Kconfig                            |   4 +-
  7 files changed, 60 insertions(+), 63 deletions(-)

Those commits merge cleanly with:

28fbc8b6a29c849a3f03a6b05010d4b584055665
Merge branch 'sched-urgent-for-linus' of

    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
    (2013-08-13 16:58:17 -0700)
Quoted 6 lines

and they can be pulled from here:

https://github.com/mfwitten/linux.git trivial/misc/0

While it is much easier to review the individual commits, a combined diff is appended to the end of this email in case that is convenient.

Looks good to me.
Thanks.

Signature · 1 line
~Randy
#2 lore raw
In reply to Michael Witten
Quoted 52 lines · Michael Witten

I've been sitting on some trivial patches for a while, and I'd just like to get them out of the way.

Here is the series:

[1] Docs: Kconfig: For readability, offset modifiers with commas
[2] Docs: Kconfig: Use consistent whitespace indentation
[3] Docs: Kconfig: Clean up the radiotap documentation
[4] Docs: Kconfig: devlopers' -> developers'
[5] Docs: Replace hotplug' with udev'
[6] DRM: comment: halve -> half
[7] DRM: comment: gdm_proc_lists -> drm_proc_lists
[8] DRM: cleanup: Remove unused `gamma_size'

  Documentation/networking/README.ipw2200 |   5 +-
  drivers/gpu/drm/drm_fb_helper.c         |   3 -
  drivers/gpu/drm/drm_irq.c               |   4 +-
  drivers/gpu/drm/drm_proc.c              |   2 +-
  drivers/net/wireless/ipw2x00/Kconfig    | 102  
++++++++++++++++----------------
  fs/btrfs/Kconfig                        |   3 +-
  init/Kconfig                            |   4 +-
  7 files changed, 60 insertions(+), 63 deletions(-)

Those commits merge cleanly with:

28fbc8b6a29c849a3f03a6b05010d4b584055665
Merge branch 'sched-urgent-for-linus' of

    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
    (2013-08-13 16:58:17 -0700)

and they can be pulled from here:

https://github.com/mfwitten/linux.git trivial/misc/0

While it is much easier to review the individual commits, a combined diff is appended to the end of this email in case that is convenient.

Sincerely
Michael Witten

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

Documentation/networking/README.ipw2200 +0 -1
index b7658be..aeb6494 100644
@@ -256,7 +256,7 @@ You can set the debug level via:
 
 Where $VALUE would be a number in the case of this sysfs entry.  The
 input to sysfs files does not have to be a number.  For example, the
-firmware loader used by hotplug utilizes sysfs entries for  
Quoted 3 lines

transferring
+firmware loader used by udev utilizes sysfs entries for transferring
the firmware image from user space into the driver.

Hotplug is the name of the kernel subsystem, udev was one implementation of a userspace agent for it. A different implementation would be mdev (in busybox), some linux from scratch types are still using variants of diethotplug, there's a fork of udev called eudev that avoids systemd...

And these days, firmware loading is mostly done directly by the kernel.

Quoted 11 lines

The Intel(R) PRO/Wireless 2915ABG Driver for Linux exposes sysfs
entries

Documentation/networking/README.ipw2200 +0 -0
@@ -425,8 +425,7 @@ are made to the driver.  Currently, there are no  

major changes planned.
----------------------------------------------

The driver requires a firmware image, download it and extract the

Documentation/networking/README.ipw2200 +1 -2
-files under /lib/firmware (or wherever your hotplug's firmware.agent
-will look for firmware files)
+files under /lib/firmware (or wherever udev will look for firmware  

files)

Again, hotplug is correct.

Rob

#3 lore raw
Quoted 36 lines · Rob Landley
Quoted 16 lines · Michael Witten

I've been sitting on some trivial patches for a while, and I'd just like to get them out of the way.

Here is the series:

...

[5] Docs: Replace hotplug' with udev'

...

Documentation/networking/README.ipw2200 +0 -0
index b7658be..aeb6494 100644

Documentation/networking/README.ipw2200 You can set the debug level via: · line 260

Quoted 6 lines
Documentation/networking/README.ipw2200 +1 -1
@@ -256,7 +256,7 @@ You can set the debug level via:
 
 Where $VALUE would be a number in the case of this sysfs entry.  The
 input to sysfs files does not have to be a number.  For example, the
-firmware loader used by hotplug utilizes sysfs entries for transferring
+firmware loader used by udev utilizes sysfs entries for transferring
 the firmware image from user space into the driver.

Hotplug is the name of the kernel subsystem, udev was one implementation of a userspace agent for it. A different implementation would be mdev (in busybox), some linux from scratch types are still using variants of diethotplug, there's a fork of udev called eudev that avoids systemd...

And these days, firmware loading is mostly done directly by the kernel.

Quoted 4 lines
Documentation/networking/README.ipw2200 +0 -0
 The Intel(R) PRO/Wireless 2915ABG Driver for Linux exposes sysfs entries
@@ -425,8 +425,7 @@ are made to the driver.  Currently, there are no major changes planned.
 ----------------------------------------------
 
Quoted 6 lines

Documentation/networking/README.ipw2200 are made to the driver. Currently, there are no major changes planned. · line 428

Quoted 4 lines
Documentation/networking/README.ipw2200 +1 -2
 The driver requires a firmware image, download it and extract the
-files under /lib/firmware (or wherever your hotplug's firmware.agent
-will look for firmware files)
+files under /lib/firmware (or wherever udev will look for firmware files)

Again, hotplug is correct.

Thanks for catching my error. I removed that patch from the series; the remaining commits can be pulled from here:

https://github.com/mfwitten/linux.git trivial/misc/1

A message that is not in the archive (sent off-list or not yet received): [email protected]

#5 lore raw
Quoted 6 lines · Michael Witten

I've updated the series to make that change instead; the updated series is here:

https://github.com/mfwitten/linux.git trivial/misc/2

Sorry for the churn.

Please send a proper new pull request, or just bounce the series through e-mail.

Thanks,

Signature · 2 lines
Jiri Kosina
SUSE Labs
#6 lore raw
Quoted 11 lines · Jiri Kosina
Quoted 6 lines · Michael Witten

I've updated the series to make that change instead; the updated series is here:

https://github.com/mfwitten/linux.git trivial/misc/2

Sorry for the churn.

Please send a proper new pull request, or just bounce the series through e-mail.

I'll do that presently, but I'm curious to know why that's useful.

#7 lore raw
Quoted 6 lines · Michael Witten
Quoted 5 lines · Jiri Kosina
Quoted 3 lines · Michael Witten

I've updated the series to make that change instead; the updated series is here:

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

https://github.com/mfwitten/linux.git trivial/misc/2

Sorry for the churn.

Please send a proper new pull request, or just bounce the series through e-mail.

I'll do that presently, but I'm curious to know why that's useful.

For completeness, here is the new request/series:

[PATCH v3 trivial 0/7] Miscellaneous Trivialities
Message-ID: <[email protected]>
http://thread.gmane.org/gmane.linux.kernel/1547748