Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 377405
b: refs/heads/master
c: 3a5a423
h: refs/heads/master
i:
  377403: eebc651
v: v3
  • Loading branch information
Johannes Berg committed Jun 19, 2013
1 parent 0e58983 commit 4bc106e
Show file tree
Hide file tree
Showing 1,842 changed files with 15,488 additions and 52,040 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eb064c3b49931dc73bba59887019c7f5cb97d322
refs/heads/master: 3a5a423bb958ad22eeccca66c533e85bf69ba10e
12 changes: 3 additions & 9 deletions trunk/Documentation/bcache.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,7 @@ cache<0..n>
Symlink to each of the cache devices comprising this cache set.

cache_available_percent
Percentage of cache device which doesn't contain dirty data, and could
potentially be used for writeback. This doesn't mean this space isn't used
for clean cached data; the unused statistic (in priority_stats) is typically
much lower.
Percentage of cache device free.

clear_stats
Clears the statistics associated with this cache
Expand Down Expand Up @@ -426,11 +423,8 @@ nbuckets
Total buckets in this cache

priority_stats
Statistics about how recently data in the cache has been accessed.
This can reveal your working set size. Unused is the percentage of
the cache that doesn't contain any data. Metadata is bcache's
metadata overhead. Average is the average priority of cache buckets.
Next is a list of quantiles with the priority threshold of each.
Statistics about how recently data in the cache has been accessed. This can
reveal your working set size.

written
Sum of all data that has been written to the cache; comparison with
Expand Down
8 changes: 6 additions & 2 deletions trunk/Documentation/devices.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,12 @@ Your cooperation is appreciated.

Each device type has 5 bits (32 minors).

13 block Previously used for the XT disk (/dev/xdN)
Deleted in kernel v3.9.
13 block 8-bit MFM/RLL/IDE controller
0 = /dev/xda First XT disk whole disk
64 = /dev/xdb Second XT disk whole disk

Partitions are handled in the same way as IDE disks
(see major number 3).

14 char Open Sound System (OSS)
0 = /dev/mixer Mixer control
Expand Down
0 ...devicetree/bindings/video/exynos_hdmi.txt → ...n/devicetree/bindings/drm/exynos/hdmi.txt
View file
File renamed without changes.
0 ...icetree/bindings/video/exynos_hdmiddc.txt → ...evicetree/bindings/drm/exynos/hdmiddc.txt
View file
File renamed without changes.
0 ...icetree/bindings/video/exynos_hdmiphy.txt → ...evicetree/bindings/drm/exynos/hdmiphy.txt
View file
File renamed without changes.
0 ...evicetree/bindings/video/exynos_mixer.txt → .../devicetree/bindings/drm/exynos/mixer.txt
View file
File renamed without changes.
17 changes: 0 additions & 17 deletions trunk/Documentation/devicetree/bindings/mips/ralink.txt
View file

This file was deleted.

2 changes: 1 addition & 1 deletion trunk/Documentation/devicetree/bindings/net/macb.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Required properties:
- compatible: Should be "cdns,[<chip>-]{macb|gem}"
Use "cdns,at91sam9260-macb" Atmel at91sam9260 and at91sam9263 SoCs.
Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".
Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
Use "cnds,pc302-gem" for Picochip picoXcell pc302 and later devices based on
the Cadence GEM, or the generic form: "cdns,gem".
- reg: Address and length of the register set for the device
- interrupts: Should contain macb interrupt
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Atmel AT91RM9200 Real Time Clock

Required properties:
- compatible: should be: "atmel,at91rm9200-rtc" or "atmel,at91sam9x5-rtc"
- compatible: should be: "atmel,at91rm9200-rtc"
- reg: physical base address of the controller and length of memory mapped
region.
- interrupts: rtc alarm/event interrupt
Expand Down
1 change: 0 additions & 1 deletion trunk/Documentation/devicetree/bindings/vendor-prefixes.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ onnn ON Semiconductor Corp.
picochip Picochip Ltd
powervr PowerVR (deprecated, use img)
qcom Qualcomm, Inc.
ralink Mediatek/Ralink Technology Corp.
ramtron Ramtron International
realtek Realtek Semiconductor Corp.
renesas Renesas Electronics Corporation
Expand Down
25 changes: 0 additions & 25 deletions trunk/Documentation/devicetree/bindings/video/simple-framebuffer.txt
View file

This file was deleted.

8 changes: 3 additions & 5 deletions trunk/Documentation/devicetree/usage-model.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,9 @@ Linux it will look something like this:
};

The bootargs property contains the kernel arguments, and the initrd-*
properties define the address and size of an initrd blob. Note that
initrd-end is the first address after the initrd image, so this doesn't
match the usual semantic of struct resource. The chosen node may also
optionally contain an arbitrary number of additional properties for
platform-specific configuration data.
properties define the address and size of an initrd blob. The
chosen node may also optionally contain an arbitrary number of
additional properties for platform-specific configuration data.

During early boot, the architecture setup code calls of_scan_flat_dt()
several times with different helper callbacks to parse device tree
Expand Down
6 changes: 3 additions & 3 deletions trunk/Documentation/dmatest.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ command:
After a while you will start to get messages about current status or error like
in the original code.

Note that running a new test will not stop any in progress test.
Note that running a new test will stop any in progress test.

The following command should return actual state of the test.
% cat /sys/kernel/debug/dmatest/run
Expand All @@ -52,8 +52,8 @@ To wait for test done the user may perform a busy loop that checks the state.

The module parameters that is supplied to the kernel command line will be used
for the first performed test. After user gets a control, the test could be
re-run with the same or different parameters. For the details see the above
section "Part 2 - When dmatest is built as a module..."
interrupted or re-run with same or different parameters. For the details see
the above section "Part 2 - When dmatest is built as a module..."

In both cases the module parameters are used as initial values for the test case.
You always could check them at run-time by running
Expand Down
3 changes: 0 additions & 3 deletions trunk/Documentation/filesystems/xfs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ When mounting an XFS filesystem, the following options are accepted.
removing extended attributes) the on-disk superblock feature
bit field will be updated to reflect this format being in use.

CRC enabled filesystems always use the attr2 format, and so
will reject the noattr2 mount option if it is set.

barrier
Enables the use of block layer write barriers for writes into
the journal and unwritten extent conversion. This allows for
Expand Down
24 changes: 3 additions & 21 deletions trunk/Documentation/kernel-parameters.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3005,27 +3005,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
Force threading of all interrupt handlers except those
marked explicitly IRQF_NO_THREAD.

tmem [KNL,XEN]
Enable the Transcendent memory driver if built-in.

tmem.cleancache=0|1 [KNL, XEN]
Default is on (1). Disable the usage of the cleancache
API to send anonymous pages to the hypervisor.

tmem.frontswap=0|1 [KNL, XEN]
Default is on (1). Disable the usage of the frontswap
API to send swap pages to the hypervisor. If disabled
the selfballooning and selfshrinking are force disabled.

tmem.selfballooning=0|1 [KNL, XEN]
Default is on (1). Disable the driving of swap pages
to the hypervisor.

tmem.selfshrinking=0|1 [KNL, XEN]
Default is on (1). Partial swapoff that immediately
transfers pages from Xen hypervisor back to the
kernel based on different criteria.

topology= [S390]
Format: {off | on}
Specify if the kernel should make use of the cpu
Expand Down Expand Up @@ -3351,6 +3330,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
plus one apbt timer for broadcast timer.
x86_mrst_timer=apbt_only | lapic_and_apbt

xd= [HW,XT] Original XT pre-IDE (RLL encoded) disks.
xd_geo= See header of drivers/block/xd.c.

xen_emul_unplug= [HW,X86,XEN]
Unplug Xen emulated devices
Format: [unplug0,][unplug1]
Expand Down
Loading

0 comments on commit 4bc106e

Please sign in to comment.