diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/SecurityBugs | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/SecurityBugs')
| -rw-r--r-- | Documentation/SecurityBugs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/SecurityBugs b/Documentation/SecurityBugs index 26c3b3635d9f..a660d494c8ed 100644 --- a/Documentation/SecurityBugs +++ b/Documentation/SecurityBugs | |||
| @@ -28,7 +28,7 @@ expect these delays to be short, measurable in days, not weeks or months. | |||
| 28 | A disclosure date is negotiated by the security team working with the | 28 | A disclosure date is negotiated by the security team working with the |
| 29 | bug submitter as well as vendors. However, the kernel security team | 29 | bug submitter as well as vendors. However, the kernel security team |
| 30 | holds the final say when setting a disclosure date. The timeframe for | 30 | holds the final say when setting a disclosure date. The timeframe for |
| 31 | disclosure is from immediate (esp. if it's already publically known) | 31 | disclosure is from immediate (esp. if it's already publicly known) |
| 32 | to a few weeks. As a basic default policy, we expect report date to | 32 | to a few weeks. As a basic default policy, we expect report date to |
| 33 | disclosure date to be on the order of 7 days. | 33 | disclosure date to be on the order of 7 days. |
| 34 | 34 | ||